Merge "Fix NewConnectionError Try Again" into mcp/xenial/extra