Merge del Branch Fix_sync

Merge del Branch Fix_sync