issue #19129: Merge to master.