DEV-20631
DEV-20329
Merge branch 'master' into releases