Merge "validate min_q against max_q"