Fixed ERRAI-627: ClassCastException from DynamicDeliveryPlan