Merge branch 'tg3'