Merge changes from TI's trunk