Merge branch 'topic/sync-to-go-2'