Merge "Fix svace issue (std::string::size_type might not 32bit)" into devel/master