Merge branch 'network-sync'