Latest shared
Merge pull request #687 from wmathurin/unstable

Latest shared
Merge branch 'unstable' into smart_sync_sample