Merge commit 'origin/bug_138_networkwizard_fixes' into experimental