Merge branch 'add-tja1120-support'