Merge in additional changes so that we remove a usage of std::string in the