Merge "Modify CSIT archive artifacts"