OfflineView checking Server Connection instead of Network Connection
Merge branch 'offline-optimize' into develop