(g2-RUI6-E046): Use g2-UU+864D instead of UU+864D in