issue #22390: bugfixes