Integrate the job from #387 and update it to use the new migrated_to_core_model fields from #400

Integrate the job from #387 and update it to use the new migrated_to_core_model fields from #400 #1466