Merge pull request #4307 from jow-/uci-network-device-support