Merge "Add new protection level for setup wizard" into nyc-dev