Merge "Compute SG via addClassResourceCleanup"