Merge branch 'jk/pkt-line-cleanup'