Merge "fix for 'add compute to aggregate'"