Brought in WLAN iface assigner from develop for hotfix
fix merge conflikt