Merge "Pre-setup restrictions" into nyc-dev