genericize DataIdentity for container types
#4591
+147
−57
Draft