Updating TS with 2.1.0 commits.