Merge "Fix doxygen errors"