Merge branch 'feature/cleanupDocs'