This looked familiar and I found this thread that appeared to be related:
I think there may have been a more recent thread around this, but I can’t find it. @darius @mseaton does this ring any bells?
(We did not run into this issue during our upgrade, fwiw…)