3cabbe3424 PR: Docs and other misc cleanup (#22508)