Merge "A few changes to the measurement implementation" into nyc-dev