Merge branch 't/sync'