Commits from branch: dev/wifi