Merge pull request #16 from shantur/8660-tp-merge

Wifi fixes