Merge "Add parser to support CSV location data"