MDL-21781 fixed some more cohort assign issues