Revert "Implement network error handling"

This reverts commit 2f9231c7ea817d8ce15fa4662c3ea8956ed8b9a7.
Merge branch 'feature'
Revert "Revert "Implement network error handling""

This reverts commit e872a1845d13ef10d0008a3616ec720db7a14ebc.
Merge remote-tracking branch 'origin/feature'
1.8.1.0 Release

Faster start up and bug fixes.
Merge from master