DSCM-22: test redirect
merge conflict solved