Adding missing fixes from TI's trunk