issue #19268: bugfixes