Dummy revert to previous version
Merge changes from TI's trunk
Merge remote-tracking branch 'origin/ti-branch'