STYLE: Update comments for Doxygen.
STYLE: Update comments for Doxygen.
STYLE: Merge changes in the master repository.