Merge "fix archive artifacts"