Merge "Convert comma in split arguments to underscore." into lmp-dev