Added `resolveFailed` support