Fix staticdoc errors
Merge tag 'v/0/10/0-staticdocs'