Proxy network checkup

This is partial rebase of gh-1070. 
cc @zeb