Patch-5.2-resilience