Avoid duplicate Sync
Merge branch 'dev' into Sovanta