Merge branch 'jn/doc-api-errors'