Merge branch 'cm/t7xxx-cleanup'