Merge "Fix QS in old-cts" into nyc-dev