Merge branch 'tm/line-log-first-parent'