Merge branch 'rs/pax-extended-header-length-fix'