issue #19131: Merge to master.