Merge branch 'tr/line-log'