Merge commit 'origin/bug_418_network_interfacenaming'