[WIP] Merge drivers and stuff to 3.0.31