issue #19155: Merge to master.