Merge pull request #3529 from github/mbg/ts/sync-back

Merge pull request #3529 from github/mbg/ts/sync-back #5857