Merge "Fix Sweetcomb archive artifact"