DELTASPIKE-484 fixed handling of contextual-storages