DEV-18083
DEV-18119
Merge branch 'master' into releases