Merge "Fix QS Issues" into nyc-dev