Prepare release 2.5.0 part2