Merge "Fix network connection check issue"