Merge branch 'typescript'