Fix documentation generation after refactor
Merge branch 'fix/doc-after-refactor'

* fix/doc-after-refactor:
  Fix documentation generation after refactor