Issue #27365:  Merge minimal part.