WIP Proxy model migrations

wip fix for #22568