(M-30937): Separate J0-6829, EGB-7E3E and U+8345.