Merge "Fix QS expanding" into nyc-dev