[teiid-dev] Branching after CR1