Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'