issue #18764: Merge to master.