issue #19268: Merge to master.