Merge branch 'branch-1.13.2' into maint