Re #10567 Add wedge option
Re #10567 Make sure changes are compatible with EQSANS
Merge branch 'feature/10567_gpsans_wedge' into develop