Merge "Gracefully handle null volumes after forgetting." into oc-dev