Merge branch 'bp/commit-p-editor' into maint