Merge remote branch 'origin/obi/bug_726_interfaces' into acid-burn/networking_changes