Merge "Modernizing phonetic name support"