DEV-18993 bug fix 2
Merge branch 'master' into releases