Merge remote-tracking branch 'origin/feature/10215_clean_indirect_diffraction_ui'
Merge branch 'master' into feature/10323_vesuvio_diffraction

Refs #10323
Merge branch 'feature/10323_vesuvio_diffraction' into develop