DEV-23973
DEV-23991
Merge branch 'master' into releases