issue #21672: Various fixes.