Merge branch 'jt/pack-header-lshift-overflow'