DEV-19412
DEV-19391
Merge branch 'master' into releases