DEV-23419
DEV-22491
Merge branch 'master' into releases