Merge "Correctly convert std::string to rust::String" into main