Another early Core Data commit, maybe to master?