Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote