Merge branch 'jk/pkt-log-pack'