issue #19450: Merge to master.