Merge pull request #5374 from Ansuel/fix-wifi