Merge remote-tracking branch 'flapflap/de-network_configuration'