Merge "Phonetic name field underlines stretch across" into oc-dev