Merge remote-tracking branch 'origin/bugfix/8842_indirect_diffraction_bug'