issue #19152: Merge to master.