(M-05693): Separate C2-213A and B-C95A; unify GT-07202.