Issue #27365: Finish merge so tests pass.
2 files changed