(U-00023B7D): Separate C6-4124; unify M-16855.