issue #22155: Various fixes.