Merge "replace char * with std::string" into rvc-dev