(mother of JSP-6674): Unify G-J90U+5DB2 and CU+2F9F4 instead of