Schema Resiliency Enhacements

Merge request reports