diff --git a/src/uikit.cs b/src/uikit.cs
index 204852e7e5..9a3bd58ff3 100644
--- a/src/uikit.cs
+++ b/src/uikit.cs
@@ -11779,9 +11779,11 @@ namespace XamCore.UIKit {
 		[Export ("textFieldDidEndEditing:"), EventArgs ("UITextField"), EventName ("Ended")]
 		void EditingEnded (UITextField textField);
 
-		[iOS (10, 0)] //HACK: We have a generator bug(?) that won't allow overloads (AmbiguousMatchException) in protocols this is the why of Foo2 naming below
-		[Export ("textFieldDidEndEditing:reason:"), EventArgs ("UITextFieldEditingEnded"), EventName ("Ended2")]
-		void EditingEnded2 (UITextField textField, UITextFieldDidEndEditingReason reason);
+		//TODO: Until we fix the below bug (hopefuly SR0) and get better names we will have this out of the API
+		// We have a generator bug (https://bugzilla.xamarin.com/show_bug.cgi?id=43579) that won't allow overloads (AmbiguousMatchException) in protocols this is the why of Foo2 naming below
+		//[iOS (10, 0)]
+		//[Export ("textFieldDidEndEditing:reason:"), EventArgs ("UITextFieldEditingEnded"), EventName ("Ended2")]
+		//void EditingEnded2 (UITextField textField, UITextFieldDidEndEditingReason reason);
 		
 		[Export ("textFieldShouldClear:"), DelegateName ("UITextFieldCondition"), DefaultValue ("true")]
 		bool ShouldClear (UITextField textField);
@@ -11948,14 +11950,15 @@ namespace XamCore.UIKit {
 		[Export ("textView:shouldInteractWithTextAttachment:inRange:"), DelegateName ("Func<UITextView,NSTextAttachment,NSRange,bool>"), DefaultValue ("true")]
 		bool ShouldInteractWithTextAttachment (UITextView textView, NSTextAttachment textAttachment, NSRange characterRange);
 
-		//HACK: We have a generator bug(?) that won't allow overloads (AmbiguousMatchException) in protocols this is the why of Foo2 naming bellow, Need to investigate more
-		[iOS (10,0)]
-		[Export ("textView:shouldInteractWithURL:inRange:interaction:"), DelegateName ("UITextViewDelegateShouldInteractUrlDelegate"), DefaultValue ("true")]
-		bool ShouldInteractWithUrl2 (UITextView textView, NSUrl url, NSRange characterRange, UITextItemInteraction interaction);
+		//TODO: Until we fix the below bug (hopefuly SR0) and get better names we will have this out of the API
+		// We have a generator bug (https://bugzilla.xamarin.com/show_bug.cgi?id=43579) that won't allow overloads (AmbiguousMatchException) in protocols this is the why of Foo2 naming below
+		//[iOS (10, 0)]
+		//[Export ("textView:shouldInteractWithURL:inRange:interaction:"), DelegateName ("UITextViewDelegateShouldInteractUrlDelegate"), DefaultValue ("true")]
+		//bool ShouldInteractWithUrl2 (UITextView textView, NSUrl url, NSRange characterRange, UITextItemInteraction interaction);
 
-		[iOS (10,0)]
-		[Export ("textView:shouldInteractWithTextAttachment:inRange:interaction:"), DelegateName ("UITextViewDelegateShouldInteractTextDelegate"), DefaultValue ("true")]
-		bool ShouldInteractWithTextAttachment2 (UITextView textView, NSTextAttachment textAttachment, NSRange characterRange, UITextItemInteraction interaction);
+		//[iOS (10,0)]
+		//[Export ("textView:shouldInteractWithTextAttachment:inRange:interaction:"), DelegateName ("UITextViewDelegateShouldInteractTextDelegate"), DefaultValue ("true")]
+		//bool ShouldInteractWithTextAttachment2 (UITextView textView, NSTextAttachment textAttachment, NSRange characterRange, UITextItemInteraction interaction);
 	}
 	
 	[NoTV]
diff --git a/tests/xtro-sharpie/ios.pending b/tests/xtro-sharpie/ios.pending
index 00a34e2c7c..dcb265dcbc 100644
--- a/tests/xtro-sharpie/ios.pending
+++ b/tests/xtro-sharpie/ios.pending
@@ -264,6 +264,11 @@
 
 # UIKit
 
+# TODO: MUST BE FIXED by SR0 or SR1 of iOS 10 related bug https://bugzilla.xamarin.com/show_bug.cgi?id=43579
+!missing-protocol-member! UITextFieldDelegate::textFieldDidEndEditing:reason: not found
+!missing-protocol-member! UITextViewDelegate::textView:shouldInteractWithTextAttachment:inRange:interaction: not found
+!missing-protocol-member! UITextViewDelegate::textView:shouldInteractWithURL:inRange:interaction: not found
+
 ## HACK: those members are not *required* in ObjC but we made them
 ## abstract to have them inlined in UITextField and UITextView
 ## Even more confusing it that respondToSelecttor return NO on them
diff --git a/tests/xtro-sharpie/tvos.pending b/tests/xtro-sharpie/tvos.pending
index df186c4e54..23422eda3b 100644
--- a/tests/xtro-sharpie/tvos.pending
+++ b/tests/xtro-sharpie/tvos.pending
@@ -70,6 +70,11 @@
 
 # UIKit
 
+# TODO: MUST BE FIXED by SR0 or SR1 of iOS 10 related bug https://bugzilla.xamarin.com/show_bug.cgi?id=43579
+!missing-protocol-member! UITextFieldDelegate::textFieldDidEndEditing:reason: not found
+!missing-protocol-member! UITextViewDelegate::textView:shouldInteractWithTextAttachment:inRange:interaction: not found
+!missing-protocol-member! UITextViewDelegate::textView:shouldInteractWithURL:inRange:interaction: not found
+
 ## Apple docs: This property is inherited from the UIView parent class. This class changes the default value of this property to NO.
 !missing-selector! UIImageView::isUserInteractionEnabled not bound
 !missing-selector! UIImageView::setUserInteractionEnabled: not bound