Merge branch 'core-1.3-updates' into release