Issue #29220: Improved fix and test.
2 files changed