Merge "Use addClassResourceCleanup for cleanup of volume resources"