Issue #968 patch for resource store dumping