Revert "Update CsvReader"

This reverts commit 19e88488d0ac7f8624ba25f68196c1617011f463.
Revert "Revert "Update CsvReader""

This reverts commit 9f81ba3313406694b5cd0ad5530ec3ed0d127797.
Merge remote-tracking branch 'origin/master'