Merge "Compute servers via addClassResourceCleanup"