Reapply Fix for NoSuchElementException that happens in IncrementalIndex when some columns are null