Re #7159 Fix issue with data already loaded
Merge branch 'feature/7159_sans_iq_subtraction' into develop