DEV-18993 bug fix 3
DEV-19000
DEV-18993 bug fix 4
Merge branch 'master' into releases