issue #22155: First pass client code.