(mother of C3-3054): Unify G-UU+3743 and G-M-06988; add