Changes made for 2.5.0 release