Merge branch 'feature/767-multiple-use-invite-token' into 'develop'