Patches 9.1 - 12.

Includes B258 compat. and many other improvements and tweaks.