[BLEEDING/BLIND/EXPERIMENTAL] Update for UUID changes