Merge "1 Pass CQ and VBR bug fixes"