Update to latest spire