csv-fix 1.6

Closes #26842.