[CWG-Stewardship] drift in v5