issue #18672: Merge to master.