Merge branch 'rebase-p-first-parent' into devel