Merge branch 'jc/unseekable-bundle' into next