Merge "add check to ensure that cq_level falls within min and max q"