DEV-18320
DEV-18189
Merge branch 'master' into releases