Merge "Fix doxygen return class with namespace"