Merge "Fix colon-separated string lists"