DEV-16919
DEV-16645
Merge branch 'master' into releases