To update a user preference, we need to update the security version number
Merge remote-tracking branch 'origin/refactor' into refactor