Issue #27365: partial merge