Merge "Add descriptions to generate doxygen page" into devel/master