Merge Item conduits and TE API from 1.6.4 branch.