@pjedrzejewski When adding https://github.com/Sylius/Sylius/pull/538 to ShippingStates, you should add it as well to OrderShippingStates. Is there something to be factorized here?