Merge "fix network disconnection handling"