TEIID-3013 additional changes