Fix: doxygen
Merge branch 'upstream/develop'