issue #19155: Merge to master.

Plus some other stuff.