Remove usage of ITEP, should fix obfuscation errors.
Merge remote-tracking branch 'upstream/master'