DEV-19270
DEV-19298
DEV-19295
Merge branch 'master' into releases