Update to 2.3.x & 0.23x series

Fix some issues with p4wifi