Merge branch 'selective-sync'