Fix OPAL-1826: Improve performance of CSV incremental import