Merge commit 'origin/bug_218_simplify_networkwizard' into experimental