Merge wireless into wireless-next