We have had issues like MB-59824 in the past- and this is a scenario we need to catch in CV to avoid regressing again- this was broken w/ original fix to MB-57457 in mid-June.