Merge "Preserve warnings on API error"