Merge branch 'feature-doxygen'