DM-1041 - Change calibrate to run both initial and final measurements unconditionally
Merge branch 'u/pgee/DM-1041'