DEV-18876
DEV-19354
Merge branch 'master' into releases