2.5.x dev

This is the updates for public development