issue #19550: Adding more stuff.