Update merge methods, switch order or init statements for core data store
Merge branch 'b/sync_successes' into development