Fix OPAL-1826: Improve performance of CSV incremental import
(cherry picked from commit b04c8fe)