Merge branch 'version-13-hotfix' into version-13