Merge with latest changes in picassowifi