Merge branch 'sync-others-shared'