Changes for 2.5beta Release