issue #19456: Fix bugs.