Merge "Remove -night qualified resources" into nyc-dev