TEIID-2902 ensuring more incremental processing in more scenarios