issue #20864: bugfixes