DEV-18883
DEV-18887
Merge branch 'master' into releases