DEV-18033
DEV-18367
Merge branch 'master' into releases