Re #10567 Make sure changes are compatible with EQSANS