Merge "Fixes volumes cleanup in base class"