Merge "More Sync in More Places" into sc-dev