Resolve Order states on OrderAware changes
Replace shipment/item events