Merge "Modify HICN artifacts"