Merge branch 'pb/template-for-single-commit-pr' into maint-2.43