Merge "Fixes in QS customization" into nyc-dev