Merge branch 'bp/commit-p-editor'