Merge branch 'jk/add-p-skip-conflicts' into maint