Merge branch 'James-Local-Sync'
garbage userdata
Initialize CMO

and cleaning up
Merge branch 'master' into James-Local-Sync