Merge branch 'feature/documentation' into HEAD