Merge "Only destroy the storage area that had trouble." into oc-mr1-dev