Merge "Fix copy and paste error" into nyc-dev