Merge branch 'release-3.13'