issue #19550: Lots of fixes. Filling out missing parts.