Merge branch 'jk/line-log-with-patch'