Merge branch 'js/pkt-line-h-typofix'