DEV-19743
DEV-19750
Merge branch 'master' into releases