Change to run initialMeasurement and measurement unconditionally, regardless of config.

Add comments
Merge branch 'u/pgee/DM-1041'