issue #19456: Merge to master.