2.5 branch updates