Merge "Don't require UNKNOWN_ERROR" into main