Update core to 2.6+
Update core to 2.6+