Merge branch 'refs/heads/t/tarball-build-fix'