Update core to 7.18