Merge "Remove unicode literal from code"