Merge branch 'beta' into fix/react-sync-state-adapter