Merge commit 'origin/bug_202_networkconfig_cleanup' into experimental