Cleaned the way sync_fields is handled
Flaked
Merge pull request #1177 from zefciu/sync_clean

Cleaned the way sync_fields is handled