Prepare 2.5.25 release
Reset for development