Re #7159 Make sure Dq is passed through
Merge branch 'feature/7159_sans_iq_subtraction' into develop