Backported tests from issue #20175.
2 files changed