re #6477 @6.0 - Modify csv import to handle commas