Merge branch 'bug/JAL-3365_extendedDSSP_via_stockholm' into develop