MAESTRO-2853 - Adjust to avoid calling 'read_output_value' which has some unexpected side-effects