Updated in line with Passport refactor.
Merge branch 'next' into refactor