Refactor the core-data
store to thunks
#28389
+67
−140
Merged