DEV-19134
DEV-19138
Merge branch 'master' into releases