Merge branch 'bug_202_networkconfig_cleanup' into experimental