issue #19268, issue #19129: Merge to master.