Merge changes from wifi repo