Merge branch 'bug_138_networkwizard_fixes'