Merge remote-tracking branch 'ms/wifi-fixes'