Merge branch 'fix-untar-infinite-loop' into release