issue #19453: Fixes.