TEA update
merge trunk