Merge "Delete user data even on error when registering AccessorProviders" into main