DEV-19429 bug fix
Merge branch 'master' into releases