DEV-22703
DEV-23359
Merge branch 'master' into releases