Fix docs and reconsile duplicate content

Closes #10387