Merge "Add missing cleanspec."