Merge branch 'version-13-beta-pre-release' into version-13-beta