Merge "QS Tweaks" into nyc-dev