TEIID-2863: Steve's modifications