Should fix MPS-18102 exception on migration (incorrect classifier scope - see ClassifierScope:54)
and related