Thank you for the clarification. I’ve submitted FB22758653. Regarding the suggestion to migrate the data with custom code, could you elaborate more on the approach? Do you mean: Implementing a custom Core Data migration flow? My understanding is that fetch indexes may still be recreated because Core Data still detects the entity’s version hash change. Directly managing the underlying SQLite schema manually? If so, how would Core Data become compatible with the updated store afterward? I’d appreciate any additional guidance on the recommended approach here.