(A-M-29237): Unify A-UU+2EBC and A-GT-37857 instead of o-GT-37857;