issue #20489: issue #20785: add back lost bugfixes