<!-- Add the related story/sub-task/bug number, like Resolves #123, or remove if NA --> **Related issue:** Resolves #37580 This migration is needed for the larger unreleased bug PR: #37616 Doing the migration separately to merge quickly and minimize merge conflicts.