Merge "Remove Persian from link underlining removal"