issue #19419: bugfixes