Merge "Fix some doxygen issues." into main