Merge "Fix use of std::stoi without error handling."