Merge commit 'origin/bug_558_wlanfixes'