Merge "Make sure to apply latest configuration to resources" into nyc-mr1-dev