Re #7930 fix system test
Merge branch 'feature/7930_fix_eqsans_norm_test' into develop