Doc fix rollup

Replaces  #17240, #17239, #17238 and #17237