DEV-20724
DEV-23732 part 1
DEV-23692
Merge branch 'master' into releases