Merge "Handle density changes in QS" into nyc-dev