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