Merge "No QS hotspot unless supported" into nyc-dev