issue #22067: bugfixes