Merge pull request #3575 from github/mbg/ts/sync-checks

Merge pull request #3575 from github/mbg/ts/sync-checks #1639