issue #19550: Fixes.