Upgrade core to 7.18