Merge "Modify doxygen group names" into devel/master