Merge "Avoid extra std::string copies"