Move spire.optional package to mirror 2.9 changes.