DEV-18951
DEV-18921
Merge branch 'master' into releases