Merge branch 'trans3'