Merge pull request #7319 from gambtho/fix-websocket-auth-fallback