Merge "[res] Make TargetResourcesContainer valid after an error" into main