Merge branch 'api-doc-improvements'