Merge "API support for more recent failure statuses"