Backported tests for issue #22406.
2 files changed