Merge "use toString instead of to_string"