DEV-22869 fix1
DEV-22869 fix2
Merge branch 'master' into releases