Sync 50% done
Merge branch 'sync'