Merge branch 'backport-linux32-system-libarchive'