[ini] prepare for future use + wifi patches for > 3.13.0