Merge branch 'Type'