Merge branch 'sync-fixes' into staging