Backported tests for issue #18531.
2 files changed