Merged typescript changes to master.