Merge commit 'origin/bug_203_fix_wrong_networkstate' into experimental