Merge "Revert "Replace to_string and stoi""