Merge remote-tracking branch 'temp/nyc-dev' into nyc-dev