Re #10824 Fixing system test for solid angle corr
Merge remote-tracking branch 'origin/master' into develop