Merge "Force second measure pass when there is a configuration change" into nyc-dev