issue #18661: Merge to master.