Merge branch 'feature/9142_conditional_enabling_DSFinterp' into develop