Merge "Update doxygen comment" into devel/master