Work on OPAL-217: Support incremental import
Work on OPAL-217: Support incremental import