New upstream based on the actual 2.5 release