Revert "Revert "Update 2.5""

This reverts commit d5877dad7605d1adc89529258f1675bb994adfc8.