Merge branch 'variable-length-ll-headers'