issue #19171: Merge to master.