Fix TE3 related bug + prep for release