Migrate more things in the new solver to specific DefIds
#146111
Merged
Loading
DefIds
#146111