Merge "Compute volumes via addClassResourceCleanup"