DEV-20527
DEV-17009
Merge branch 'master' into releases