DEV-17143
DEV-17931
Merge branch 'master' into releases