4016 - Sync Improvements

Enhancements to Sync service