(M-19721): Separate G0-3838, C1-4558, J90-4963 and U+7236; unify