DEV-18876
DEV-19665
DEV-19680
Merge branch 'master' into releases