Merge pull request #3503 from github/mbg/ff/make-connection-checks-de…

Merge pull request #3503 from github/mbg/ff/make-connection-checks-de… #7647