Fix the user stubs migration to work when no users exist
Merge branch 'bug/fix-user-stubs-migration' into development