Update for v2.5.0p0 release.