Upgrade to 2.5 release
Upgrade to 2.5 release, add missing files