issue #19224: Merge to master