Upgrades for core 2.5.0