Starting point for 2.5.8 dev

Lots of additions and fixes.