[WIP] Feature/valkyrie update crc dataset resource

@anusha Please see these commits in conjunction with the comments here.

---

Note: We may need to un-merge an earlier merged request before merging this; but we can deal with that later.