issue #19130: Merge to master.