Merge branch 'multi-authentication-fix'