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