TEIID-2598 ensuring 7.4 compatibility