Issue #15818: Merge.