Merge branch 'bugfix/10571_indirect_algoritm_output_properties' into bugfix/10604_idr_calib_new_run_numbers

Refs #10604
Fix preview plots on Calib and Diag

Refs #10604
Merge branch 'bugfix/10604_idr_calib_new_run_numbers' into develop