Merged to Wifi branch