Re #7159 First cut at subtraction algorithm
Merge branch 'feature/7159_sans_iq_subtraction' into develop