Update core to 0.87.2