Merge "Clean up compute class resources via addClassResourceCleanup"