Merge branch 'release' into core-pr-3
Merge branch 'core-pr-3' into release