New branch for contacts unicode fix