Merge branch 'master' into feature/10094_support_diffraction_corrections
Added systemtest for diffraction corrections

Refs #10094
Merge branch 'feature/10094_support_diffraction_corrections' into develop