Merge branch 'version-12-hotfix' into version-12