Fixed #22239 -- Add auto detection of renamed models
Merge pull request #2415 from SmileyChris/migration-renamed-models

Fixed #22239 -- Add auto detection of renamed models