Merge branch 'ab/doc-cat-file-e-still-shows-errors' into maint