Merge "Limit Q variability in two pass."