Checkout and Close Part 1
Merge branch 'James-Local-Sync'
CloudManagement Entity
Merge branch 'James-Local-Sync'