Merge "Fix comments for doxygen"