Merge branch 'pb/log-first-parent-p-m'