Merge "Wifi slice improvement"