Merge "Replace std::string global variables with C-style string." into devel/master