Merge branch 'new-versioning-scheme' into branch-1.13.2