Resolve critical core infrastructure issue