issue #18763: Merge to master.