Merge branch 'v12-pre-release' into version-12