FYI for next sprint I'm going to be moving this data to component_instance in a consistent fashion - can we get a test case that causes the corruption so I can be sure that I've fixed it?