issue #19549: Merge to master.