DEV-18050
DEV-18389
Merge branch 'master' into releases