Adjusting check point data, bug fixes
Merge remote-tracking branch 'mandli/data-refactor-monolithic' into data-refactor-monolithic
Merge remote-tracking branch 'mandli/data-refactor-monolithic' into data-refactor-monolithic