Merge "Fix comment to remove Doxygen tool warning" into devel/master