TEIID-2152 initial merge support