Sync Mantle to f4d6840570 (branch: better-coredata)