Topic: resiliency improvement