Merge "Separate measure so it can only run inflate if needed" into nyc-dev