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