Merge "Fix archive-artifacts failing to archive"