Re:[watcher] Compute CDM builder issues (mostly perf related)