diff --git a/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs b/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
index 0d555a4dbc19..5edc6e93954a 100644
--- a/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
+++ b/src/Compatibility/ControlGallery/src/Android/FormsAppCompatActivity.cs
@@ -18,6 +18,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Android
 
 	[Activity(Label = "Microsoft Maui Controls Compatibility Gallery", Icon = "@drawable/icon", Theme = "@style/MyTheme",
 		MainLauncher = true, HardwareAccelerated = true,
+		LaunchMode = LaunchMode.SingleTask,
 		ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.UiMode)]
 	[IntentFilter(new[] { Intent.ActionView },
 		Categories = new[]
diff --git a/src/Compatibility/ControlGallery/src/Core/CoreGallery.cs b/src/Compatibility/ControlGallery/src/Core/CoreGallery.cs
index bdb3aff9e2d0..ba6ea8bb6a61 100644
--- a/src/Compatibility/ControlGallery/src/Core/CoreGallery.cs
+++ b/src/Compatibility/ControlGallery/src/Core/CoreGallery.cs
@@ -550,6 +550,24 @@ public CoreRootPage(Page rootPage, NavigationBehavior navigationBehavior = Navig
 
 			var corePageView = new CorePageView(rootPage, navigationBehavior);
 
+			var resetCheckBox = new CheckBox
+			{
+				AutomationId = "ResetMainPage",
+				VerticalOptions = LayoutOptions.Center,
+			};
+			var resetLabel = new Label
+			{
+				Text = "Reset MainPage",
+				VerticalOptions = LayoutOptions.Center,
+			};
+			var resetLayout = new HorizontalStackLayout
+			{
+				resetCheckBox,
+				resetLabel
+			};
+			resetLayout.HorizontalOptions = LayoutOptions.End;
+			resetLayout.Margin = new Microsoft.Maui.Thickness(12);
+
 			var searchBar = new SearchBar()
 			{
 				AutomationId = "SearchBar"
@@ -566,28 +584,43 @@ public CoreRootPage(Page rootPage, NavigationBehavior navigationBehavior = Navig
 				AutomationId = "GoToTestButton",
 				Command = new Command(async () =>
 				{
+					bool resetMainPage = resetCheckBox.IsChecked;
+
 					if (!string.IsNullOrEmpty(searchBar.Text))
 					{
 						if (!(await corePageView.PushPage(searchBar.Text)))
 						{
-							foreach (CoreViewContainer item in CoreRootView.ItemsSource)
+							var testCaseScreen = new TestCases.TestCaseScreen(resetMainPage);
+							await Task.Delay(50); // Load all the issues before try to navigate.
+
+							if (TestCases.TestCaseScreen.PageToAction.ContainsKey(searchBar.Text?.Trim()))
+							{
+								TestCases.TestCaseScreen.PageToAction[searchBar.Text?.Trim()]();
+							}
+							else
 							{
-								if (item.Name == searchBar.Text)
+								foreach (CoreViewContainer item in CoreRootView.ItemsSource)
 								{
-									CoreRootView.SelectedItem = item;
-									break;
+									if (item.Name == searchBar.Text)
+									{
+										CoreRootView.SelectedItem = item;
+										break;
+									}
 								}
 							}
 						}
 					}
 					else
-						await Navigation.PushModalAsync(TestCases.GetTestCases());
+					{
+						await Navigation.PushModalAsync(TestCases.GetTestCases(resetMainPage));
+					}
 				})
 			};
 
 			var stackLayout = new StackLayout()
 			{
 				Children = {
+					resetLayout,
 					testCasesButton,
 					searchBar,
 					new Button {
diff --git a/src/Compatibility/ControlGallery/src/Core/TestCases.cs b/src/Compatibility/ControlGallery/src/Core/TestCases.cs
index 92bcef269e9f..4302f3797d52 100644
--- a/src/Compatibility/ControlGallery/src/Core/TestCases.cs
+++ b/src/Compatibility/ControlGallery/src/Core/TestCases.cs
@@ -29,64 +29,75 @@ static TextCell MakeIssueCell(string text, string detail, Action tapped)
 				return cell;
 			}
 
-			Action ActivatePageAndNavigate(IssueAttribute issueAttribute, Type type)
+			Action ActivatePageAndNavigate(IssueAttribute issueAttribute, Type type, bool reset = false)
 			{
-				Action navigationAction = null;
-
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.PushAsync)
+				if (reset)
 				{
-					return async () =>
+					return () =>
 					{
 						var page = ActivatePage(type);
 						TrackOnInsights(page);
-						await Navigation.PushAsync(page);
+						Application.Current.MainPage = page;
 					};
 				}
-
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.PushModalAsync)
+				else
 				{
-					return async () =>
-					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						await Navigation.PushModalAsync(page);
-					};
-				}
+					Action navigationAction = null;
 
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.Default)
-				{
-					return async () =>
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.PushAsync)
 					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						if (page is ContentPage || page is CarouselPage)
+						return async () =>
 						{
-
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
 							await Navigation.PushAsync(page);
+						};
+					}
 
-						}
-						else if (page is Shell)
-						{
-							Application.Current.MainPage = page;
-						}
-						else
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.PushModalAsync)
+					{
+						return async () =>
 						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
 							await Navigation.PushModalAsync(page);
-						}
-					};
-				}
+						};
+					}
 
-				if (issueAttribute.NavigationBehavior == NavigationBehavior.SetApplicationRoot)
-				{
-					return () =>
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.Default)
 					{
-						var page = ActivatePage(type);
-						TrackOnInsights(page);
-						Application.Current.MainPage = page;
-					};
-				}
+						return async () =>
+						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
+
+							if (page is ContentPage || page is CarouselPage)
+							{
+								await Navigation.PushAsync(page);
+							}
+							else if (page is Shell)
+							{
+								Application.Current.MainPage = page;
+							}
+							else
+							{
+								await Navigation.PushModalAsync(page);
+							}
+						};
+					}
 
-				return navigationAction;
+					if (issueAttribute.NavigationBehavior == NavigationBehavior.SetApplicationRoot)
+					{
+						return () =>
+						{
+							var page = ActivatePage(type);
+							TrackOnInsights(page);
+							Application.Current.MainPage = page;
+						};
+					}
+
+					return navigationAction;
+				}
 			}
 
 			static void TrackOnInsights(Page page)
@@ -159,8 +170,10 @@ void VerifyNoDuplicates()
 			   });
 			}
 
-			public TestCaseScreen()
+			public TestCaseScreen(bool resetMainPage = false)
 			{
+				ResetMainPage = resetMainPage;
+
 				AutomationId = "TestCasesIssueList";
 
 				Intent = TableIntent.Settings;
@@ -178,13 +191,15 @@ public TestCaseScreen()
 						 IssueTestNumber = attribute.IssueTestNumber,
 						 Name = attribute.DisplayName,
 						 Description = attribute.Description,
-						 Action = ActivatePageAndNavigate(attribute, type)
+						 Action = ActivatePageAndNavigate(attribute, type, ResetMainPage)
 					 }).ToList();
 
 				VerifyNoDuplicates();
 
 				FilterIssues();
 			}
+			
+			internal bool ResetMainPage { get; set; }
 
 			public void FilterTracker(IssueTracker tracker)
 			{
@@ -293,7 +308,7 @@ from issueModel in _issues
 			bool IsExempt(string name) => _exemptNames.Contains(name);
 		}
 
-		public static NavigationPage GetTestCases()
+		public static NavigationPage GetTestCases(bool resetMainPage = false)
 		{
 			TestCaseScreen testCaseScreen = null;
 			var rootLayout = new StackLayout();
@@ -347,7 +362,7 @@ public static NavigationPage GetTestCases()
 			rootLayout.Children.Add(searchBar);
 			rootLayout.Children.Add(searchButton);
 
-			testCaseScreen = new TestCaseScreen();
+			testCaseScreen = new TestCaseScreen(resetMainPage);
 
 			rootLayout.Children.Add(CreateTrackerFilter(testCaseScreen));
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs
index 269fad0934b4..2741bf7c5c57 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla26233.cs
@@ -24,7 +24,7 @@ protected override void Init()
 			var listview = new ListView();
 			listview.ItemTemplate = new DataTemplate(typeof(ItemTemplate));
 			listview.ItemsSource = new string[] { "item1", "item2", "item3", "item4", "item5", null, null };
-			var btnBack = new Button { Text = "back", Command = new Command(() => Navigation.PopAsync()) };
+			var btnBack = new Button { AutomationId = "back", Text = "back", Command = new Command(() => Navigation.PopAsync()) };
 			listview.ItemSelected += (s, e) => Navigation.PushAsync(new ContentPage { Content = btnBack });
 			var btnPush = new Button
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27731.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27731.cs
index f3db2d43cc3d..3d25e6e03f95 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27731.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla27731.cs
@@ -36,7 +36,7 @@ public Page2(string title)
 					Children =
 				{
 					new Label { Text = $"This is page {count}." },
-					new Button { Text = "Click", Command = new Command(() => Navigation.PushAsync(new Page2(title))) }
+					new Button { AutomationId = "Click", Text = "Click", Command = new Command(() => Navigation.PushAsync(new Page2(title))) }
 				}
 				};
 			}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla28570.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla28570.cs
index dcc7f2ea78b1..0b3a8ee4ee8a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla28570.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla28570.cs
@@ -82,6 +82,7 @@ protected override void Init()
 			};
 
 			Button makeBig = new Button();
+			makeBig.AutomationId = "Tap";
 			makeBig.Text = "Tap";
 			//
 			// Clicking button first time does not scroll event though scrollView.Height is already set.
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
index 2388b1214479..459b14332396 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29363.cs
@@ -28,6 +28,7 @@ protected override void Init()
 
 			Button modal = new Button
 			{
+				AutomationId = "ModalPushPopTest",
 				Text = "Modal Push Pop Test",
 				FontAttributes = FontAttributes.Bold,
 				FontSize = 25,
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs
index f76986e0bfe9..72da9cd3a2a4 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla29453.cs
@@ -24,6 +24,7 @@ protected override void Init()
 			{
 				Children = {
 					new Label {
+						AutomationId ="Page1",
 						HorizontalTextAlignment = TextAlignment.Center,
 						Text = "Page 1"
 					}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30166.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30166.cs
index c436dd9bc4e5..54bac6fecd6a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30166.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla30166.cs
@@ -25,11 +25,13 @@ protected override void Init()
 			{
 				Content = new Button
 				{
+					AutomationId = "PushModal",
 					Text = "Push Modal",
 					Command = new Command(async () => await Navigation.PushModalAsync(new ContentPage
 					{
 						Content = new Button
 						{
+							AutomationId = "Back",
 							Text = "Back",
 							Command = new Command(async () => await Navigation.PopModalAsync()),
 						},
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
index af27d1d8b71b..c469131ac9c6 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31366.cs
@@ -23,8 +23,8 @@ protected override void Init()
 			var page1 = new ContentPage() { Title = "Page1" };
 
 			var successLabel = new Label();
-			var startPopOnAppearing = new Button() { Text = "Start PopOnAppearing Test" };
-			var startModalStack = new Button() { Text = "Start ModalStack Test" };
+			var startPopOnAppearing = new Button() { AutomationId = "StartPopOnAppearingTest", Text = "Start PopOnAppearing Test" };
+			var startModalStack = new Button() { AutomationId = "StartModalStackTest", Text = "Start ModalStack Test" };
 
 			page1.Content = new StackLayout()
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs
index 1d85bc08d544..888da2620fb9 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31395.cs
@@ -26,6 +26,7 @@ protected override void Init()
 					VerticalOptions = LayoutOptions.Center,
 					Children = {
 						new Button {
+							AutomationId ="SwitchMainPage",
 							Text = "Switch Main Page",
 							Command = new Command (() => SwitchMainPage ())
 						}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31688.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31688.cs
index e902f1da10ea..cf8c11814438 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31688.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla31688.cs
@@ -86,7 +86,7 @@ class Page3 : ContentPage
 		{
 			private Page3()
 			{
-				Content = new Label { Text = "Page 3" };
+				Content = new Label { AutomationId = "Page3", Text = "Page 3" };
 			}
 
 			public static async Task<Page3> CreateAsync()
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs
index 6cb9b64ca435..5d7de1ccb46d 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla34007.cs
@@ -24,6 +24,7 @@ protected override void Init()
 
 			var button0 = new Button
 			{
+				AutomationId = "Button0",
 				Text = "Button 0",
 				HorizontalOptions = LayoutOptions.Fill,
 				VerticalOptions = LayoutOptions.Fill
@@ -31,6 +32,7 @@ protected override void Init()
 
 			var button1 = new Button
 			{
+				AutomationId = "Button1",
 				Text = "Button 1",
 				HorizontalOptions = LayoutOptions.Fill,
 				VerticalOptions = LayoutOptions.Fill
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35472.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35472.cs
index 7704b49a65d4..629c213fee20 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35472.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35472.cs
@@ -22,7 +22,7 @@ public class Bugzilla35472 : TestNavigationPage
 		protected override void Init()
 		{
 			// Set up the scroll viewer page
-			var scrollToButton = new Button() { Text = "Now push this button" };
+			var scrollToButton = new Button() { AutomationId = "NowPushButton", Text = "Now push this button" };
 
 			var stackLayout = new StackLayout();
 
@@ -46,6 +46,7 @@ protected override void Init()
 			// Set up the start page
 			var goButton = new Button()
 			{
+				AutomationId = "PushButton",
 				Text = "Push this button"
 			};
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs
index 029e7e3fe3e1..c5f174e66387 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla35477.cs
@@ -26,7 +26,7 @@ protected override void Init()
 				Text = "Tap the frame below. The label with the text 'No taps yet' should change its text to 'Frame was tapped'."
 			};
 			var frame = new Frame() { };
-			var frameLabel = new Label() { Text = "Tap here" };
+			var frameLabel = new Label() { AutomationId = "TapHere", Text = "Tap here" };
 
 			frame.Content = new StackLayout() { Children = { frameLabel } };
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38723.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38723.cs
index 6368ab0505a5..d6e9d05c7545 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38723.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla38723.cs
@@ -35,7 +35,8 @@ protected override void Init()
 			};
 
 			var button = new Button
-			{
+			{ 
+				AutomationId = "SELECT",
 				Text = "SELECT"
 			};
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39489.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39489.cs
index 6f58f1ce8c42..6bc6017f0060 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39489.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39489.cs
@@ -81,9 +81,9 @@ public Bz39489Content()
 			Interlocked.Increment(ref s_count);
 			Debug.WriteLine($">>>>> Bz39489Content Bz39489Content 54: Constructor, count is {s_count}");
 
-			var button = new Button { Text = "New Page" };
+			var button = new Button { AutomationId = "NewPage", Text = "New Page" };
 
-			var gcbutton = new Button { Text = "GC" };
+			var gcbutton = new Button { AutomationId = "GC", Text = "GC" };
 
 			var map = new Bz39489Map();
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39636.xaml b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39636.xaml
index 3c8aa6ed3c6c..27d481b14c07 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39636.xaml
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39636.xaml
@@ -21,7 +21,7 @@
 
   <local:TestContentPage.Content>
     <StackLayout HorizontalOptions="Fill" VerticalOptions="Fill">
-      <Label Text="Success"></Label>
+      <Label AutomationId="Success" Text="Success"></Label>
       <Label Text="If there is a blue box and a red box below, this test has passed. If the application crashes, the test has not passed."></Label>
       <BoxView HorizontalOptions="Center" VerticalOptions="Center" BackgroundColor="Blue" WidthRequest="{StaticResource SizeMedium}">
         <BoxView.HeightRequest>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39821.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39821.cs
index 5d6dbe7dc9d4..a4de976264af 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39821.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla39821.cs
@@ -28,7 +28,7 @@ protected override void Init()
 
 			var success = new Label { Text = "Success", IsVisible = false };
 
-			var button = new Button() { Text = "Animate" };
+			var button = new Button() { AutomationId = "Animate", Text = "Animate" };
 
 			Content = new StackLayout
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40005.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40005.cs
index 7e72116786d3..64acc371d62b 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40005.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla40005.cs
@@ -42,6 +42,7 @@ public Page1()
 			{
 				var btn = new Button()
 				{
+					AutomationId = GoToPage2,
 					Text = GoToPage2
 				};
 				btn.Clicked += async (sender, e) =>
@@ -56,6 +57,7 @@ public Page1()
 					{
 						new Label
 						{
+							AutomationId = PageOneLabel,
 							HorizontalTextAlignment = TextAlignment.Center,
 							Text = PageOneLabel
 						},
@@ -122,6 +124,7 @@ public Page2()
 					{
 						new Label
 						{
+							AutomationId = PageTwoLabel,
 							HorizontalTextAlignment = TextAlignment.Center,
 							Text = PageTwoLabel
 						}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41842.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41842.cs
index b1cb628d1c13..e9a0d2a53a47 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41842.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla41842.cs
@@ -24,7 +24,7 @@ protected override void Init()
 			Flyout = new Page() { Title = "Flyout" };
 
 			Detail = new NavigationPage(new Page());
-			Detail = new NavigationPage(new ContentPage { Content = new Label { Text = "Success" } });
+			Detail = new NavigationPage(new ContentPage { Content = new Label { AutomationId = "Success", Text = "Success" } });
 		}
 
 #if UITEST
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42069.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42069.cs
index 7518ac99851c..5bc63dd0ec94 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42069.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42069.cs
@@ -43,14 +43,14 @@ protected override void Init()
 			var label2 = new Label { Text = instructions2, HorizontalTextAlignment = TextAlignment.Center };
 
 			var startButton = new Button { Text = "Start" };
-			startButton.Clicked += (sender, args) =>
+			startButton.Clicked += async (sender, args) =>
 			{
 				// We have to do the push-pop-push dance because NavigationPage
 				// holds a reference to its last page for unrelated reasons; our concern 
 				// here is that the first Bugzilla42069_Page that we pushed gets collected
-				PushAsync(new Bugzilla42069_Page(), false);
-				PopAsync(false);
-				PushAsync(new Bugzilla42069_Page(), false);
+				await PushAsync(new Bugzilla42069_Page(), false);
+				await PopAsync(false);
+				await PushAsync(new Bugzilla42069_Page(), false);
 			};
 
 			var collectButton = new Button { Text = "Collect" };
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42277.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42277.cs
index ed99f7f75311..bbf841dad041 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42277.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42277.cs
@@ -39,32 +39,32 @@ public MyDataTemplateSelector()
 			{
 				_1Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success1 };
+					return new TextCell { AutomationId = Success1, Text = Success1 };
 				});
 
 				_2Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success2 };
+					return new TextCell { AutomationId = Success2, Text = Success2 };
 				});
 
 				_3Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success3 };
+					return new TextCell { AutomationId = Success3, Text = Success3 };
 				});
 
 				_4Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success4 };
+					return new TextCell { AutomationId = Success4, Text = Success4 };
 				});
 
 				_5Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success5 };
+					return new TextCell { AutomationId = Success5, Text = Success5 };
 				});
 
 				_6Template = new DataTemplate(() =>
 				{
-					return new TextCell { Text = Success6 };
+					return new TextCell { AutomationId = Success6, Text = Success6 };
 				});
 			}
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42956.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42956.cs
index 59c93b88405f..47b58369624a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42956.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla42956.cs
@@ -69,7 +69,7 @@ public MyDataTemplateSelector()
 				seventeen = new DataTemplate(() => new ViewCell { View = new Label { Text = "I am the seventeen!" } });
 				eighteen = new DataTemplate(() => new ViewCell { View = new Label { Text = "I am the eighteen!" } });
 				nineteen = new DataTemplate(() => new ViewCell { View = new Label { Text = "I am the nineteen! Is this how I should be databinding? Whatev." } });
-				twenty = new DataTemplate(() => new ViewCell { View = new Label { Text = Success } });
+				twenty = new DataTemplate(() => new ViewCell { View = new Label { AutomationId = Success, Text = Success } });
 			}
 
 			protected override DataTemplate OnSelectTemplate(object item, BindableObject container)
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
index 562e9f8cd25f..2656762d19a8 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla43519.cs
@@ -64,6 +64,7 @@ protected override void Init()
 			Children.Add(mdp);
 			Children.Add(new ContentPage
 			{
+				AutomationId = Page2,
 				Title = Page2,
 				Content = new StackLayout
 				{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45702.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45702.cs
index 0afefa022f4e..51d8aabe14b4 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45702.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45702.cs
@@ -35,7 +35,7 @@ class DetailPage45702 : ContentPage
 		{
 			public DetailPage45702()
 			{
-				var button = new Button { Text = "Click me" };
+				var button = new Button { AutomationId = "ClickMe", Text = "Click me" };
 				button.Clicked += Button_Clicked;
 				Content = button;
 			}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
index 016aa4ea648e..da8521af6dcb 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla45722.cs
@@ -86,7 +86,7 @@ protected override void Init()
 			lv.ItemsSource = items;
 			lv.ItemTemplate = dt;
 
-			var button = new Button { Text = Update };
+			var button = new Button { AutomationId = Update, Text = Update };
 			button.Clicked += (sender, args) =>
 			{
 				items.Clear();
@@ -96,7 +96,7 @@ protected override void Init()
 				}
 			};
 
-			var collect = new Button() { Text = Collect };
+			var collect = new Button() { AutomationId = Collect, Text = Collect };
 			collect.Clicked += (sender, args) =>
 			{
 				GarbageCollectionHelper.Collect();
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51238.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51238.cs
index 9a3ca1729574..5caf29981189 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51238.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla51238.cs
@@ -51,6 +51,7 @@ protected override void Init()
 
 			var button = new Button
 			{
+				AutomationId = "TapMe",
 				Text = "Tap Me!",
 				HorizontalOptions = LayoutOptions.Center,
 				VerticalOptions = LayoutOptions.Center
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53179.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53179.cs
index d6e3d20f0ee6..8c522ba8942b 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53179.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53179.cs
@@ -23,9 +23,9 @@ class TestPage : ContentPage
 
 			public TestPage(int index)
 			{
-				nextBtn = new Button { Text = "Next Page" };
-				rmBtn = new Button { Text = "Remove previous pages" };
-				popBtn = new Button { Text = "Back" };
+				nextBtn = new Button { AutomationId = "Next Page", Text = "Next Page" };
+				rmBtn = new Button { AutomationId = "Remove previous pages", Text = "Remove previous pages" };
+				popBtn = new Button { AutomationId = "Back", Text = "Back" };
 
 				nextBtn.Clicked += async (sender, e) => await Navigation.PushAsync(new TestPage(index + 1));
 				rmBtn.Clicked += (sender, e) =>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53445.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53445.cs
index 9f5061004f43..a926528ad797 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53445.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla53445.cs
@@ -22,7 +22,7 @@ protected override void Init()
 		{
 			var layout = new StackLayout { VerticalOptions = LayoutOptions.Fill, Spacing = 20 };
 
-			var status = new Label { Text = "Success" };
+			var status = new Label { AutomationId = "Success", Text = "Success" };
 
 			var instructions = new Label { Text = "Disable all of the layouts by clicking the Toggle button. Then click the buttons inside each layout. If the status changes from Success to Fail, this test has failed." };
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla55365.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla55365.cs
index 1879878a04be..b902dbfa233f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla55365.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla55365.cs
@@ -52,17 +52,18 @@ protected override void Init()
 				_itemsPanel.Children.Add(view);
 			}
 
-			var clearButton = new Button { Text = "Clear", Command = new Command(o => viewModel.Clear()) };
+			var clearButton = new Button { AutomationId = "Clear", Text = "Clear", Command = new Command(o => viewModel.Clear()) };
 			_layout.Children.Add(clearButton);
 
 			var collectButton = new Button
 			{
+				AutomationId = "Garbage",
 				Text = "Garbage",
 				Command = new Command(o =>
-{
-	GarbageCollectionHelper.Collect();
-	_layout.Children.Add(new Label { Text = "Success" });
-})
+				{
+					GarbageCollectionHelper.Collect();
+					_layout.Children.Add(new Label { Text = "Success" });
+				})
 			};
 			_layout.Children.Add(collectButton);
 			_layout.Children.Add(_itemsPanel);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57674.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57674.cs
index d186e5392a26..961ae53d578c 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57674.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla57674.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
 #endif
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 57674, "ListView not honoring INotifyCollectionChanged ", PlatformAffected.UWP)]
+	[Issue(IssueTracker.Bugzilla, 57674, "ListView not honoring INotifyCollectionChanged", PlatformAffected.UWP)]
 	public class Bugzilla57674 : TestContentPage
 	{
 		MyCollection _myCollection;
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59896.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59896.cs
index f926c022dc58..82f051e5fd62 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59896.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59896.cs
@@ -14,7 +14,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Bugzilla)]
 #endif
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Bugzilla, 59896, "v2.4.0: Adding inserting section to ListView causes crash IF first section is empty ", PlatformAffected.iOS)]
+	[Issue(IssueTracker.Bugzilla, 59896, "v2.4.0: Adding inserting section to ListView causes crash IF first section is empty", PlatformAffected.iOS)]
 	public class Bugzilla59896 : TestContentPage
 	{
 		const string btnAdd = "btnAdd";
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59925.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59925.cs
index a5b4c4a2ab86..0a9a74eaab99 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59925.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Bugzilla59925.cs
@@ -32,12 +32,14 @@ protected override void Init()
 
 			var buttonBigger = new Button
 			{
-				Text = "Bigger",
+				AutomationId = "Bigger",
+				Text = "Bigger"
 			};
 			buttonBigger.Clicked += (x, o) => ChangeFontSize(Delta);
 
 			var buttonSmaller = new Button
 			{
+				AutomationId = "Smaller",
 				Text = "Smaller"
 			};
 			buttonSmaller.Clicked += (x, o) => ChangeFontSize(-Delta);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/GitHub1648.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/GitHub1648.cs
index 392ebf79e62e..061c5dfe1d17 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/GitHub1648.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/GitHub1648.cs
@@ -41,10 +41,12 @@ public SimplePage()
 				{
 					Children = {
 						new Label {
+							AutomationId = "Success",
 							Text = "Success"
 						},
 						new Button
 						{
+							AutomationId = "Reload",
 							Text = "Reload",
 							Command = new Command(() => Navigation.PopModalAsync())
 						}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11333.xaml b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11333.xaml
index 1d2a018f8250..e5d286f44044 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11333.xaml
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue11333.xaml
@@ -69,6 +69,7 @@
                 </StackLayout>
                 <Label
                     x:Name="ResultLabel"
+                    AutomationId="ResultLabel"
                     Text="Close"/>
             </StackLayout>
         </Frame>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12374.xaml.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12374.xaml.cs
index 63e19a4cdc24..e78f26bce85f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12374.xaml.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12374.xaml.cs
@@ -18,7 +18,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 	[Category(UITestCategories.CollectionView)]
 #endif
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Github, 12374, "[Bug] [iOS] CollectionView EmptyView causes the application to crash",
+	[Issue(IssueTracker.Github, 12374, "[Bug] iOS XF 5.0-pre1 crash with CollectionView when using EmptyView",
 		PlatformAffected.iOS)]
 	public partial class Issue12374 : TestContentPage
 	{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12714.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12714.cs
index 44a1a61658cc..1b3319bc3a66 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12714.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue12714.cs
@@ -34,7 +34,7 @@ protected override void Init()
 
 			var layout = new StackLayout() { Margin = 40 };
 
-			var button = new Button { Text = Show };
+			var button = new Button { AutomationId = Show, Text = Show };
 			button.Clicked += (sender, args) => { cv.IsVisible = !cv.IsVisible; };
 
 			layout.Children.Add(button);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1469.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1469.cs
index 409f34ab542f..45998c152c26 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1469.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1469.cs
@@ -45,8 +45,8 @@ protected override void Init()
 			{
 				Children = {
 					new Label { Text = "If you click an item in the list it should not become selected" },
-					new Button { Text = Go, Command = new Command(() => list.SelectedItem = _items[2]) },
-					new Button { Text = Back, Command = new Command(() => list.SelectedItem = list.SelectedItem = null) },
+					new Button { AutomationId = Go, Text = Go, Command = new Command(() => list.SelectedItem = _items[2]) },
+					new Button { AutomationId = Back, Text = Back, Command = new Command(() => list.SelectedItem = list.SelectedItem = null) },
 					statusLabel,
 					list
 				}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1601.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1601.cs
index 758b3d061127..7e88369085be 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1601.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1601.cs
@@ -38,7 +38,7 @@ protected override void Init()
 				Orientation = StackOrientation.Horizontal
 			};
 			Microsoft.Maui.Controls.CompressedLayout.SetIsHeadless(stack, true);
-			var button = new Button { Text = "CRASH!" };
+			var button = new Button { AutomationId = "CrashButton", Text = "CRASH!" };
 			stack.Children.Add(button);
 			grid.Children.Add(stack, 0, 1);
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
index 9fdab5bb4884..5c21b00773f1 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1667.cs
@@ -34,7 +34,7 @@ protected override void Init()
 			_cursorStartPosition = new Entry { AutomationId = "CursorStart" };
 			_selectionLength = new Entry { AutomationId = "SelectionLength" };
 
-			_updateButton = new Button { Text = "Update" };
+			_updateButton = new Button { AutomationId = "Update", Text = "Update" };
 			_updateButton.Clicked += UpdateCursor;
 
 			var layout = new StackLayout
@@ -54,13 +54,13 @@ protected override void Init()
 
 			if (DeviceInfo.Platform == DevicePlatform.iOS)
 			{
-				var red = new Button { Text = "Red", TextColor = Colors.Red };
+				var red = new Button { AutomationId = "Red", Text = "Red", TextColor = Colors.Red };
 				red.Clicked += (sender, e) => _entry.On<PlatformConfiguration.iOS>().SetCursorColor(Colors.Red);
 
-				var blue = new Button { Text = "Blue", TextColor = Colors.Blue };
+				var blue = new Button { AutomationId = "Blue", Text = "Blue", TextColor = Colors.Blue };
 				blue.Clicked += (sender, e) => _entry.On<PlatformConfiguration.iOS>().SetCursorColor(Colors.Blue);
 
-				var defaultColor = new Button { Text = "Default" };
+				var defaultColor = new Button { AutomationId = "Default", Text = "Default" };
 				defaultColor.Clicked += (sender, e) => _entry.On<PlatformConfiguration.iOS>().SetCursorColor(null);
 
 				layout.Children.Add(red);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1733.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1733.cs
index f1c0ff7a5690..7f01fd00718f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1733.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1733.cs
@@ -101,17 +101,20 @@ protected override void Init()
 
 			Button buttonChangeFont = new Button()
 			{
+				AutomationId = btnChangeFontToLarger,
 				Text = btnChangeFontToLarger
 			};
 
 
 			Button buttonChangeText = new Button()
 			{
+				AutomationId = btnChangeToHasText,
 				Text = btnChangeToHasText
 			};
 
 			Button buttonChangeSizeOption = new Button()
 			{
+				AutomationId = btnChangeSizeOption,
 				Text = btnChangeSizeOption
 			};
 
@@ -123,12 +126,12 @@ protected override void Init()
 					if (e.FontSize == fontSizeInitial)
 					{
 						e.FontSize = 40;
-						Device.BeginInvokeOnMainThread(() => buttonChangeFont.Text = btnChangeFontToDefault);
+						Device.BeginInvokeOnMainThread(() => buttonChangeFont.AutomationId = buttonChangeFont.Text = btnChangeFontToDefault);
 					}
 					else
 					{
 						e.FontSize = fontSizeInitial;
-						Device.BeginInvokeOnMainThread(() => buttonChangeFont.Text = btnChangeFontToLarger);
+						Device.BeginInvokeOnMainThread(() => buttonChangeFont.AutomationId = buttonChangeFont.Text = btnChangeFontToLarger);
 					}
 				});
 			};
@@ -318,4 +321,4 @@ Size GetDimensions(string editorName)
 
 #endif
 	}
-}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1769.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1769.cs
index 3c3bc46d7f19..855eece2f33a 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1769.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1769.cs
@@ -45,6 +45,7 @@ public SwitchDemoPage()
 
 				_label = new Label
 				{
+					AutomationId = string.Format(SwitchIsNowLabelTextFormat, switcher.IsToggled),
 					Text = string.Format(SwitchIsNowLabelTextFormat, switcher.IsToggled),
 					FontSize = Device.GetNamedSize(NamedSize.Large, typeof(Label)),
 					HorizontalOptions = LayoutOptions.Center,
@@ -76,6 +77,7 @@ protected override void Init()
 		{
 			var button = new Button()
 			{
+				AutomationId = GoToPageTwoButtonText,
 				Text = GoToPageTwoButtonText
 			};
 			button.Clicked += async (sender, args) =>
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
index 2554636f7919..9848dc340fbb 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1799.cs
@@ -29,7 +29,7 @@ protected override void Init()
 
 			var instructions = new Label { Text = "Pull the the ListView down and release. If the application crashes, the test has failed." };
 
-			var success = new Label { Text = Success };
+			var success = new Label { AutomationId = Success, Text = Success };
 
 			layout.Children.Add(instructions);
 			layout.Children.Add(success);
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue181.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue181.cs
index 5a36347fdb35..748491ef2576 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue181.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue181.cs
@@ -23,6 +23,7 @@ protected override void Init()
 				BackgroundColor = new Color(1.0f, 1.0f, 0.0f),
 				Content = new Label
 				{
+					AutomationId = "TestLabel",
 					Text = "I should have red text",
 					TextColor = Colors.Red,
 					BackgroundColor = new Color(0.5f, 0.5f, 0.5f),
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1942.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1942.cs
index 32ed8aaf02fd..9394b8d42314 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1942.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1942.cs
@@ -33,7 +33,7 @@ protected override void Init()
 				{
 					new Grid
 					{
-						Children = { new Label() { Text = ClickMeString, BackgroundColor = Colors.Blue, HeightRequest = 300, WidthRequest = 300 } }
+						Children = { new Label() { AutomationId = ClickMeString, Text = ClickMeString, BackgroundColor = Colors.Blue, HeightRequest = 300, WidthRequest = 300 } }
 					}
 				}
 			};
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
index d65808ef97ff..8ad298a65255 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue1975.cs
@@ -33,7 +33,7 @@ protected override void Init()
 
 		ContentPage CreateRootPage()
 		{
-			var button = new Button { Text = Go };
+			var button = new Button { AutomationId = Go, Text = Go };
 
 			button.Clicked += (sender, args) => Application.Current.MainPage = ModifyDataPage();
 
@@ -60,7 +60,7 @@ ContentPage CreateRootPage()
 
 		ContentPage ModifyDataPage()
 		{
-			var contentPage = new ContentPage { Content = new Label { Text = Success, Margin = 100 } };
+			var contentPage = new ContentPage { Content = new Label { AutomationId = Success, Text = Success, Margin = 100 } };
 
 			contentPage.Appearing += (sender, args) =>
 				DataSample.Instance.Items.Add(new Item("C") { new SubItem("Cherry"), new SubItem("Cranberry") });
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
index 6bdbdaf0a5d0..2989abdc6af3 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2035.cs
@@ -21,7 +21,7 @@ protected override void Init()
 		{
 			Title = "Bug";
 			Children.Add(new ContentPage() { Title = "Page 1" });
-			Children.Add(new ContentPage() { Title = "Page 2", Content = new Label { Text = Success } });
+			Children.Add(new ContentPage() { Title = "Page 2", Content = new Label { AutomationId = Success, Text = Success } });
 			Children.Add(new ContentPage() { Title = "Page 3" });
 			CurrentPage = Children[1];
 		}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2222.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2222.cs
index d91abcc0df1f..b9f1565f4c19 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2222.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2222.cs
@@ -33,7 +33,7 @@ public Issue22221()
 				Content = new StackLayout
 				{
 					Children = {
-						new Label { Text = "Hello Toolbaritem" }
+						new Label { AutomationId = "TestLabel", Text = "Hello Toolbaritem" }
 					}
 				};
 			}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2241.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2241.cs
index dcc3625a4a8b..0457d3c264c7 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2241.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2241.cs
@@ -64,6 +64,7 @@ protected override void Init()
 
 			var scrollView = new ScrollView
 			{
+				AutomationId = "TestScrollView",
 				HorizontalOptions = LayoutOptions.FillAndExpand,
 				VerticalOptions = LayoutOptions.FillAndExpand,
 				Padding = new Thickness(20),
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
index 1a6dfe9de4d0..e7adccc3a655 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2259.cs
@@ -53,6 +53,7 @@ protected override void Init()
 
 			var buttonAdd = new Button
 			{
+				AutomationId = "AddButton",
 				Text = "Add",
 				HorizontalOptions = LayoutOptions.Start,
 				VerticalOptions = LayoutOptions.Center,
@@ -60,6 +61,7 @@ protected override void Init()
 
 			var buttonRemove = new Button
 			{
+				AutomationId = "RemoveButton",
 				Text = "Remove",
 				HorizontalOptions = LayoutOptions.Center,
 				VerticalOptions = LayoutOptions.Center,
@@ -67,6 +69,7 @@ protected override void Init()
 
 			var buttonScrollToBottom = new Button
 			{
+				AutomationId = "BottomButton",
 				Text = "Bottom",
 				HorizontalOptions = LayoutOptions.Start,
 				VerticalOptions = LayoutOptions.Center,
@@ -111,6 +114,7 @@ protected override void Init()
 					   }
 				   };
 
+				   nameLabel.SetBinding(Label.AutomationIdProperty, "Name");
 				   nameLabel.SetBinding(Label.TextProperty, "Name");
 				   birthdayLabel.SetBinding(Label.TextProperty, new Binding("Birthday", BindingMode.OneWay, null, null, "Born {0:d}"));
 				   boxView.SetBinding(BoxView.ColorProperty, "FavoriteColor");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2354.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2354.cs
index bbf70f791d01..fae7d085c432 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2354.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2354.cs
@@ -47,6 +47,7 @@ protected override void Init()
 
 			var listView = new ListView(ListViewCachingStrategy.RecycleElement)
 			{
+				AutomationId = "TestListView",
 				ItemsSource = presidents,
 				ItemTemplate = cell,
 				RowHeight = 200
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2653.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2653.cs
index 90725c05c435..fc8564f551b2 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2653.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2653.cs
@@ -58,6 +58,7 @@ protected override void Init()
 
 			layout.Children.Add(new Button()
 			{
+				AutomationId = ButtonText,
 				Text = ButtonText,
 				BackgroundColor = Colors.Green,
 				Margin = 10,
@@ -93,7 +94,9 @@ protected override void Init()
 					layout,
 					new Button()
 					{
-						Text = TestForButtonClicked, Command = new Command(() =>
+						AutomationId = TestForButtonClicked,
+						Text = TestForButtonClicked, 
+						Command = new Command(() =>
 						{
 							if(bv == null)
 							{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2681.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2681.cs
index 334d95cd6797..42e093ebabc7 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2681.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2681.cs
@@ -24,7 +24,7 @@ public class Issue2681 : TestNavigationPage
 		const string NavigateToPage = "Click Me.";
 		protected override void Init()
 		{
-			PushAsync(new ContentPage() { Title = "Freeze Test", Content = new Button() { Text = NavigateToPage, Command = new Command(() => this.PushAsync(new FreezeMe())) } });
+			PushAsync(new ContentPage() { Title = "Freeze Test", Content = new Button() { AutomationId = NavigateToPage, Text = NavigateToPage, Command = new Command(() => this.PushAsync(new FreezeMe())) } });
 		}
 
 		[Preserve(AllMembers = true)]
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2837.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2837.cs
index e48de4ca8d01..bca511481354 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2837.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2837.cs
@@ -12,7 +12,7 @@ namespace Microsoft.Maui.Controls.ControlGallery.Issues
 	[NUnit.Framework.Category(Compatibility.UITests.UITestCategories.Github5000)]
 #endif
 	[Preserve(AllMembers = true)]
-	[Issue(IssueTracker.Github, 2837, " Exception thrown during NavigationPage.Navigation.PopAsync", PlatformAffected.Android)]
+	[Issue(IssueTracker.Github, 2837, "Exception thrown during NavigationPage.Navigation.PopAsync", PlatformAffected.Android)]
 	public class Issue2837 : TestNavigationPage // or TestFlyoutPage, etc ...
 	{
 		string _labelText = "worked";
@@ -26,7 +26,7 @@ protected override async void OnAppearing()
 		{
 			var nav = (NavigationPage)this;
 
-			nav.Navigation.InsertPageBefore(new ContentPage() { Title = "SecondPage ", Content = new Label { Text = _labelText } }, nav.CurrentPage);
+			nav.Navigation.InsertPageBefore(new ContentPage() { Title = "SecondPage ", Content = new Label { AutomationId = _labelText, Text = _labelText } }, nav.CurrentPage);
 			await nav.Navigation.PopAsync(false);
 			base.OnAppearing();
 		}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2929.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2929.cs
index 23d03ae61123..a0d41cef8d58 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2929.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue2929.cs
@@ -33,7 +33,7 @@ protected override void Init()
 				Children =
 				{
 					instructions,
-					new Label { Text = Success },
+					new Label { AutomationId = Success, Text = Success },
 					lv
 				}
 			};
@@ -75,7 +75,7 @@ protected override void Init()
 
 			var result = new Label();
 
-			var button = new Button { Text = Go };
+			var button = new Button { AutomationId = Go, Text = Go };
 
 			button.Clicked += (sender, args) =>
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3089.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3089.cs
index d224105b2c4f..12d9c3522407 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3089.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3089.cs
@@ -54,7 +54,7 @@ public MainPageCode()
 			{
 				ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "add1" });
 
-				ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { Text = "reload" });
+				ToolbarItems.Add(new Microsoft.Maui.Controls.ToolbarItem() { AutomationId = "reload", Text = "reload" });
 
 				ToolbarItems[0].SetBinding(ToolbarItem.CommandProperty, "Add1Command");
 				ToolbarItems[1].SetBinding(ToolbarItem.CommandProperty, "Add2Command");
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3273.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3273.cs
index 62e46c0397d7..a4982ea7f664 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3273.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3273.cs
@@ -54,7 +54,8 @@ protected override void Init()
 			{
 				Children = {
 					statusLabel,
-					new Button {
+					new Button {   
+						AutomationId = "Move items",
 						Text = "Move items",
 						Command = new Command(() =>
 						{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
index fb2731f6ac5f..8b13edb2fda0 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3390.cs
@@ -22,6 +22,7 @@ protected override void Init()
 		{
 			var btn = new Button()
 			{
+				AutomationId = "TestButton",
 				Text = "Click me",
 				WidthRequest = 50,
 				HeightRequest = 50,
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3667.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3667.cs
index 0328a99d71d8..2d9c5728bba7 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3667.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue3667.cs
@@ -36,6 +36,7 @@ protected override void Init()
 			};
 			var but = new Button
 			{
+				AutomationId = "ChangeTextTransformButton",
 				Text = "Change TextTransform",
 				Command = new Command(() =>
 				{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue417.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue417.cs
index 0142fb1b23b2..cf3121ed38a0 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue417.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue417.cs
@@ -37,10 +37,12 @@ public class FirstPage : ContentPage
 			public FirstPage()
 			{
 				Title = "First Page";
+				AutomationId = "FirstPage";
 				BackgroundColor = Colors.Black;
 
 				var nextPageBtn = new Button
 				{
+					AutomationId = "NextPage",
 					Text = "Next Page"
 				};
 
@@ -56,9 +58,11 @@ public class NextPage : ContentPage
 			public NextPage()
 			{
 				Title = "Second Page";
+				AutomationId = "SecondPage";
 
 				var nextPage2Btn = new Button
 				{
+					AutomationId = "NextPage2",
 					Text = "Next Page 2"
 				};
 
@@ -74,9 +78,11 @@ public class NextPage2 : ContentPage
 			public NextPage2()
 			{
 				Title = "Third Page";
+				AutomationId = "ThirdPage";
 
 				var popToRootButton = new Button
 				{
+					AutomationId = "PopToRoot",
 					Text = "Pop to root"
 				};
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue465.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue465.cs
index a2877dcf3361..fdb801defb70 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue465.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue465.cs
@@ -29,6 +29,7 @@ protected override async void Init()
 				{
 					Content = new Label
 					{
+						AutomationId = "Popppppped",
 						Text = "I was popppppped"
 					}
 				}
@@ -44,6 +45,7 @@ public ModalPage()
 			{
 				var popButton = new Button
 				{
+					AutomationId = "PopPage",
 					Text = "Pop this page"
 				};
 				popButton.Clicked += (s, e) => Navigation.PopModalAsync();
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5555.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5555.cs
index fda24536d192..2d4f0b1fc81c 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5555.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5555.cs
@@ -54,6 +54,7 @@ protected override void Init()
 
 			var checkButton = new Button
 			{
+				AutomationId = "CheckResultButton",
 				Text = "Check Result",
 				IsEnabled = false,
 				Command = new Command(() =>
@@ -75,6 +76,7 @@ protected override void Init()
 					result,
 					new Button
 					{
+						AutomationId = "PushPageButton",
 						Text = "Push page",
 						Command = new Command(async() => {
 							var page = new LeakPage();
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5951.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5951.cs
index 77a8281728ee..1deec3c9522f 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5951.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue5951.cs
@@ -25,6 +25,7 @@ protected override void Init()
 
 			var pushButton = new Button
 			{
+				AutomationId = "Push page",
 				Text = "Push page",
 				Command = new Command(async () =>
 				{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6260.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6260.cs
index 467ce68c1385..6b924adfdca9 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6260.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6260.cs
@@ -40,6 +40,7 @@ protected override void Init()
 
 			var label = new Label()
 			{
+				AutomationId = success,
 				Text = success
 			};
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6286.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6286.cs
index 87f95602d955..a5e74b614240 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6286.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6286.cs
@@ -65,11 +65,11 @@ async void RunTest()
 			}
 		}
 
-		void Webview_Navigated(object sender, WebNavigatedEventArgs e)
+		async void Webview_Navigated(object sender, WebNavigatedEventArgs e)
 		{
-			webview.EvaluateJavaScriptAsync("document.write('i executed this javascript woohoo');");
+			await webview.EvaluateJavaScriptAsync("document.write('i executed this javascript woohoo');");
 
-			webview2.EvaluateJavaScriptAsync("document.write('i executed this javascript woohoo');");
+			await webview2.EvaluateJavaScriptAsync("document.write('i executed this javascript woohoo');");
 		}
 
 #if UITEST
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6368.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6368.cs
index 6f7c6c986ca8..1d457cb4e801 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6368.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6368.cs
@@ -46,7 +46,7 @@ protected override void Init()
 		static StackLayout GetContent()
 		{
 			var content2 = new StackLayout();
-			content2.Children.Add(new RoundedLabel { Text = "Go to next Page" });
+			content2.Children.Add(new RoundedLabel { AutomationId = "GoToNextPage", Text = "Go to next Page" });
 			content2.Children.Add(new RoundedLabel { Text = "then navigate back" });
 			content2.Children.Add(new RoundedLabel { Text = "If test doesn't crash it passed" });
 			content2.Children.Add(new CustomView());
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6994.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6994.cs
index 21589defd697..2fd570ca2859 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6994.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue6994.cs
@@ -27,7 +27,7 @@ public class Issue6994 : TestContentPage
 		protected override void Init()
 		{
 			var source = new ObservableCollection<ItemViewModel>(Enumerable.Range(0, 100).Select(i => new ItemViewModel(i.ToString(), false)).ToList());
-			var button = new Button { Text = "Click me" };
+			var button = new Button { AutomationId = "Click me", Text = "Click me" };
 
 			var listView = new ListView
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7371.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7371.cs
index 909b48383257..66981ed42903 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7371.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue7371.cs
@@ -29,7 +29,7 @@ protected override void OnAppearing()
 
 			ListView.IsRefreshing = true;
 
-			Application.Current.MainPage = new ContentPage() { Content = new Label { Text = "Success", VerticalOptions = LayoutOptions.Center } };
+			Application.Current.MainPage = new ContentPage() { Content = new Label { AutomationId = "Success", Text = "Success", VerticalOptions = LayoutOptions.Center } };
 
 			ListView.IsRefreshing = false;
 		}
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
index a254720d9130..2820bbc1fd20 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue773.cs
@@ -59,9 +59,9 @@ public CannotScrollRepro()
 				BackgroundColor = Colors.Gray
 			};
 
-			var button1 = new Button { Text = "Button 1" };
-			var button2 = new Button { Text = "Button 2", IsEnabled = false };
-			var button3 = new Button { Text = "Button 3", IsEnabled = false };
+			var button1 = new Button { AutomationId = "Button1", Text = "Button 1" };
+			var button2 = new Button { AutomationId = "Button2", Text = "Button 2", IsEnabled = false };
+			var button3 = new Button { AutomationId = "Button3", Text = "Button 3", IsEnabled = false };
 			var button4 = new Button { Text = "Button 4", IsEnabled = false };
 			var button5 = new Button { Text = "Button 5", IsEnabled = false };
 			var button6 = new Button { Text = "Button 6", IsEnabled = false };
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
index 0e3f540e1ea4..be083bb0c679 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8167.cs
@@ -44,7 +44,7 @@ protected override void Init()
 
 			var model = new _8167ViewModel();
 
-			var button = new Button() { Text = Run };
+			var button = new Button() { AutomationId = Run, Text = Run };
 
 			button.Clicked += (obj, args) =>
 			{
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue852.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue852.cs
index ededff94cd6c..d587e6baeeae 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue852.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue852.cs
@@ -32,6 +32,7 @@ public Issue852()
 		{
 			var welcomeLabel = new Label()
 			{
+				AutomationId = "WelcomeLabel",
 				Text = "Logging into the System",
 				HorizontalOptions = LayoutOptions.Center
 			};
@@ -76,6 +77,7 @@ void BuildLogin()
 			Title = "Login";
 			var welcomeLabel = new Label()
 			{
+				AutomationId = "WelcomeLabel",
 				Text = "Welcome to the System",
 				HorizontalOptions = LayoutOptions.Center
 			};
@@ -100,6 +102,7 @@ void BuildLogin()
 
 			_loginButton = new Button
 			{
+				AutomationId = "Login",
 				ClassId = "loginButton",
 				Text = "Login",
 			};
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8801.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8801.cs
index fed92a5c7cee..ab3b05ba5e97 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8801.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue8801.cs
@@ -51,7 +51,7 @@ protected override void Init()
 				}
 			};
 
-			grid.AddChild(new Label() { Text = "Success" }, 0, 0);
+			grid.AddChild(new Label() { AutomationId = "Success", Text = "Success" }, 0, 0);
 			grid.AddChild(layout, 0, 1);
 
 			Content = grid;
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue935.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue935.cs
index 4fe2e16e61bc..13a2fdeea269 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue935.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue935.cs
@@ -32,6 +32,7 @@ public CustomViewCell()
 
 			var label = new Label
 			{
+				AutomationId = "TestLabel",
 				Text = "I have been selected:"
 			};
 
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9355.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9355.cs
index ded90ad65b0f..8d46ca801376 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9355.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9355.cs
@@ -46,6 +46,7 @@ await PushAsync(new ContentPage
 				{
 					Content = new Label
 					{
+						AutomationId = TestOk,
 						Text = TestOk
 					}
 				});
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9419.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9419.cs
index daf36992ad45..ea088f02ea7e 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9419.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9419.cs
@@ -35,7 +35,7 @@ protected override async void Init()
 
 			GarbageCollectionHelper.Collect();
 
-			Detail = new NavigationPage(new ContentPage { Content = new Label { Text = OkResult } });
+			Detail = new NavigationPage(new ContentPage { Content = new Label { AutomationId = OkResult, Text = OkResult } });
 		}
 
 		class ConditionalToolbarItem : ToolbarItem
diff --git a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9580.cs b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9580.cs
index c97f888d7982..7eea4b40c402 100644
--- a/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9580.cs
+++ b/src/Compatibility/ControlGallery/src/Issues.Shared/Issue9580.cs
@@ -51,7 +51,7 @@ protected override void Init()
 
 			var result = new Label { };
 
-			var button = new Button { Text = Test9580 };
+			var button = new Button { AutomationId = Test9580, Text = Test9580 };
 			button.Clicked += (sender, args) =>
 			{
 				groups[0].Add(new _9580Item { Text = "An Item" });
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj
index 4515e8ece37e..fdc122a5178e 100644
--- a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/ControlGallery.Shared.Appium.UITests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.Build.NoTargets">
+<Project Sdk="Microsoft.Build.NoTargets">
     
   <PropertyGroup>
     <TargetFrameworks>$(_MauiDotNetTfm)</TargetFrameworks>
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/IssuesUITest.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/IssuesUITest.cs
index b8931ebf2c4e..84c113292b14 100644
--- a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/IssuesUITest.cs
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/IssuesUITest.cs
@@ -1,4 +1,4 @@
-using NUnit.Framework;
+using NUnit.Framework;
 using UITest.Appium;
 
 namespace UITests
@@ -38,8 +38,7 @@ protected override void FixtureTeardown()
 			base.FixtureTeardown();
 			try
 			{
-				this.Back();
-				RunningApp.Tap("GoBackToGalleriesButton");
+				RunningApp.ResetApp();
 			}
 			catch (Exception e)
 			{
@@ -49,15 +48,30 @@ protected override void FixtureTeardown()
 		}
 
 		public abstract string Issue { get; }
+		public virtual bool ResetMainPage { get; private set; } = true;
 
-		private void NavigateToIssue(string issue)
+		void NavigateToIssue(string issue)
 		{
-			RunningApp.NavigateToIssues();
+			if (ResetMainPage)
+			{
+				RunningApp.Click("ResetMainPage");
+
+				RunningApp.ClearText("SearchBar");
+				RunningApp.EnterText("SearchBar", issue);
+
+				RunningApp.WaitForElement("GoToTestButton");
+				RunningApp.Tap("GoToTestButton");
+			}
+			else
+			{
+				RunningApp.NavigateToIssues();
 
-			RunningApp.EnterText("SearchBarGo", issue);
+				RunningApp.ClearText("SearchBarGo");
+				RunningApp.EnterText("SearchBarGo", issue);
 
-			RunningApp.WaitForElement("SearchButton");
-			RunningApp.Tap("SearchButton");
+				RunningApp.WaitForElement("SearchButton");
+				RunningApp.Tap("SearchButton");
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla23942.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla23942.cs
new file mode 100644
index 000000000000..4ffccefe3742
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla23942.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla23942 : IssuesUITest
+	{
+		public Bugzilla23942(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Cannot bind properties in BindableObjects added to static resources in XAML";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]	
+		[FailsOnIOS]
+		public void Bugzilla23942Test()
+		{
+			RunningApp.WaitForNoElement("success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla25943.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla25943.cs
new file mode 100644
index 000000000000..7fe468722aa9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla25943.cs
@@ -0,0 +1,35 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla25943 : IssuesUITest
+	{
+		public Bugzilla25943(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] TapGestureRecognizer does not work with a nested StackLayout";
+
+		/*	
+		const string InnerLayout = "innerlayout";
+		const string OuterLayout = "outerlayout";
+		const string Success = "Success";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void VerifyNestedStacklayoutTapsBubble()
+		{
+			RunningApp.WaitForElement(InnerLayout);
+			RunningApp.Tap(InnerLayout);
+
+			RunningApp.WaitForElement(OuterLayout);
+			RunningApp.Tap(OuterLayout);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla28570.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla28570.cs
new file mode 100644
index 000000000000..de7278f772a2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla28570.cs
@@ -0,0 +1,30 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla28570 : IssuesUITest
+	{
+		public Bugzilla28570(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "https://bugzilla.xamarin.com/show_bug.cgi?id=28570";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid("Scroll to end not working.")]
+		public void Bugzilla28570Test()
+		{
+			RunningApp.WaitForElement("Tap");
+			RunningApp.Screenshot("At test page");
+			RunningApp.Tap("Tap");
+
+			RunningApp.WaitForElement("28570Target");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29128.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29128.cs
new file mode 100644
index 000000000000..fb0b47434b43
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29128.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla29128 : IssuesUITest
+	{
+		public Bugzilla29128(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Slider background lays out wrong Android";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnIOS]
+		public void Bugzilla29128Test()
+		{
+			RunningApp.WaitForElement("SliderId");
+			RunningApp.Screenshot("Slider and button should be centered");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29363.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29363.cs
new file mode 100644
index 000000000000..380d2676afc9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29363.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla29363 : IssuesUITest
+	{
+		public Bugzilla29363(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "PushModal followed immediate by PopModal crashes";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void PushButton()
+		{
+			RunningApp.WaitForElement("ModalPushPopTest");
+			RunningApp.Tap("ModalPushPopTest");
+			Thread.Sleep(2000);
+
+			// if it didn't crash, yay
+			RunningApp.WaitForElement("ModalPushPopTest");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29453.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29453.cs
new file mode 100644
index 000000000000..5817a6e37c0a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla29453.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla29453 : IssuesUITest
+	{
+		public Bugzilla29453(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Navigation.PopAsync(false) in Entry.Completed handler => System.ArgumentException";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla29453Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("I am at Issue Bugzilla29453");
+			RunningApp.WaitForElement("Page1");
+			RunningApp.Tap("btnGotoPage2");
+			RunningApp.Tap("entryText");
+			RunningApp.EnterText("entryText", "XF");
+
+			RunningApp.DismissKeyboard();
+			RunningApp.Back();
+
+			// TODO: Implement PressEnter method.
+			//RunningApp.PressEnter();
+			//RunningApp.WaitForElement("Page1");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30166.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30166.cs
new file mode 100644
index 000000000000..f84b6645afd3
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30166.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla30166 : IssuesUITest
+	{
+		public Bugzilla30166(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NavigationBar.BarBackgroundColor resets on Lollipop after popping modal page";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void Issue10222Test()
+		{
+			try
+			{
+				RunningApp.WaitForElement("PushModal");
+				RunningApp.Tap("PushModal");
+				RunningApp.WaitForElement("Back");
+				RunningApp.Tap("Back");
+				RunningApp.Screenshot("Navigation bar should be red");
+			}
+			finally
+			{
+				RunningApp.Back();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30935.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30935.cs
new file mode 100644
index 000000000000..56d0cfcf4642
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla30935.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla30935 : IssuesUITest
+	{
+		public Bugzilla30935(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NullReferenceException in ViewRenderer<TView, TNativeView> (Microsoft.Maui.Controls.Platform.Android)";
+
+		[Test]
+		[Category(UITestCategories.Page)]
+		public void Bugzilla30935DoesntThrowException()
+		{
+			RunningApp.WaitForNoElement("IssuePageLabel");
+			RunningApp.WaitForNoElement("entry");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31255.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31255.cs
new file mode 100644
index 000000000000..c85387181f65
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31255.cs
@@ -0,0 +1,29 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla31255 : IssuesUITest
+	{
+		public Bugzilla31255(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Flyout's page Icon cause memory leak after FlyoutPage is popped out by holding on page";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Ignore("The sample is crashing.")]
+		[Category(UITestCategories.Navigation)]
+		[IgnoredDuringMoveToAppium("The sample is crashing. More information: https://github.com/dotnet/maui/issues/21206")]
+		public async Task Bugzilla31255Test()
+		{
+			RunningApp.Screenshot("I am at Bugzilla 31255");
+			await Task.Delay(5000);
+			RunningApp.WaitForNoElement("Page1. But Page2 IsAlive = False");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31366.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31366.cs
new file mode 100644
index 000000000000..bd9248daf697
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31366.cs
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla31366 : IssuesUITest
+	{
+		public Bugzilla31366(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Pushing and then popping a page modally causes ArgumentOutOfRangeException";
+		public override bool ResetMainPage => false;
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			Reset();
+		}
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue31366PushingAndPoppingModallyCausesArgumentOutOfRangeException()
+		{
+			RunningApp.Tap("StartPopOnAppearingTest");
+			RunningApp.WaitForNoElement("If this is visible, the PopOnAppearing test has passed.");
+		}
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue31366PushingWithModalStackCausesIncorrectStackOrder()
+		{
+			RunningApp.Tap("StartModalStackTest");
+			RunningApp.WaitForNoElement("If this is visible, the modal stack test has passed.");
+			RunningApp.Back();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31395.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31395.cs
new file mode 100644
index 000000000000..538f24d8ee56
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31395.cs
@@ -0,0 +1,30 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla31395 : IssuesUITest
+	{
+		public Bugzilla31395(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Crash when switching MainPage and using a Custom Render";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Bugzilla31395Test()
+		{
+			RunningApp.WaitForElement("SwitchMainPage");
+			Assert.DoesNotThrow(() =>
+			{
+				RunningApp.Tap("SwitchMainPage");
+			});
+			RunningApp.WaitForNoElement("Hello");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31688.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31688.cs
new file mode 100644
index 000000000000..f2ead0f9856d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla31688.cs
@@ -0,0 +1,26 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla31688 : IssuesUITest
+	{
+		public Bugzilla31688(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla31688Test()
+		{
+			RunningApp.WaitForNoElement("Page3");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32206.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32206.cs
new file mode 100644
index 000000000000..730dcbd1130c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32206.cs
@@ -0,0 +1,43 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla32206 : IssuesUITest
+	{
+		public Bugzilla32206(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ContextActions cause memory leak: Page is never destroyed";
+
+		[Test]
+		[Category(UITestCategories.Page)]
+		[FailsOnIOS]
+		public void Bugzilla32206Test()
+		{
+			try
+			{
+				for (var n = 0; n < 10; n++)
+				{
+					RunningApp.WaitForElement("Push");
+					RunningApp.Tap("Push");
+
+					RunningApp.WaitForElement("ListView");
+					RunningApp.Back();
+				}
+
+				// At this point, the counter can be any value, but it's most likely not zero.
+				// Invoking GC once is enough to clean up all garbage data and set counter to zero
+				RunningApp.WaitForElement("GC");
+				RunningApp.Tap("GC");
+
+				RunningApp.WaitForNoElement("Counter: 0");
+			}
+			finally
+			{
+				RunningApp.Back();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32615.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32615.cs
new file mode 100644
index 000000000000..bd335621b962
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32615.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla32615 : IssuesUITest
+	{
+		public Bugzilla32615(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "OnAppearing is not called on previous page when modal page is popped";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public async Task Bugzilla32615Test()
+		{
+			RunningApp.Tap("btnModal");
+			RunningApp.Tap("btnPop");
+			await Task.Delay(1000);
+			RunningApp.WaitForNoElement("1");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32830.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32830.cs
new file mode 100644
index 000000000000..86400bb53d4d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32830.cs
@@ -0,0 +1,33 @@
+#if !ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla32830 : IssuesUITest
+	{
+		const string Button1 = "button1";
+		const string Button2 = "button2";
+		const string BottomLabel = "I am visible at the bottom of the page";
+
+		public Bugzilla32830(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Hiding navigation bar causes layouts to shift during navigation";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAllPlatforms]
+		public void Bugzilla32830Test()
+		{
+			RunningApp.WaitForNoElement(BottomLabel);
+			RunningApp.WaitForElement(Button1);
+			RunningApp.Tap(Button1);
+			RunningApp.WaitForElement(Button2);
+			RunningApp.Tap(Button2);
+			RunningApp.WaitForNoElement(BottomLabel);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32898.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32898.cs
new file mode 100644
index 000000000000..06c022ea5215
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla32898.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla32898 : IssuesUITest
+	{
+		const string Success = "Success";
+		const int Timeout = 20000;
+
+		public Bugzilla32898(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Memory leak when TabbedPage is popped out ";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issu32898Test()
+		{
+			var timeout = Timeout; // Give this a little slop to set the result text
+			RunningApp.WaitForNoElement(Success, timeout: TimeSpan.FromMilliseconds(timeout));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34007.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34007.cs
new file mode 100644
index 000000000000..964ada2e3e9b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34007.cs
@@ -0,0 +1,43 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla34007 : IssuesUITest
+	{
+		public Bugzilla34007(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Z order drawing of children views are different on Android, iOS, Win";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void Issue34007TestFirstElementHasLowestZOrder()
+		{
+			var buttonLocations = RunningApp.WaitForElement("Button0");
+
+			var rect = buttonLocations.GetRect();
+			var x = rect.CenterX();
+			var y = rect.CenterY();
+
+			// Button 1 was the last item added to the grid; it should be tappable
+			RunningApp.Tap("Button1");
+
+			// The label should indicate that Button 1 was the last button tapped
+			RunningApp.WaitForNoElement("Button 1 was tapped last");
+
+			RunningApp.Screenshot("Buttons Reordered");
+
+			// Tapping Button1 1 reordered the buttons in the grid; Button 0 should
+			// now be on top. Tapping at the Button 1 location should actually tap
+			// Button 0, and the label should indicate that
+			RunningApp.TapCoordinates(x, y);
+			RunningApp.WaitForNoElement("Button 0 was tapped last");
+
+			RunningApp.Screenshot("Button 0 Tapped");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34061.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34061.cs
new file mode 100644
index 000000000000..88360581e310
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla34061.cs
@@ -0,0 +1,30 @@
+#if !ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla34061 : IssuesUITest
+	{
+		public Bugzilla34061(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "RelativeLayout - First child added after page display does not appear";
+
+		[Test]
+		[Ignore("The sample is crashing.")]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAllPlatforms("The sample is crashing. More information: https://github.com/dotnet/maui/issues/21204")]
+		public void Bugzilla34061Test()
+		{
+			RunningApp.Screenshot("I am at Bugzilla34061 ");
+			RunningApp.WaitForElement("btnAdd");
+			RunningApp.Tap("btnAdd");
+			RunningApp.WaitForElement("Remove Me");
+			RunningApp.Screenshot("I see the button");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35472.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35472.cs
new file mode 100644
index 000000000000..02bc610d1359
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35472.cs
@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla35472 : IssuesUITest
+	{
+		public Bugzilla35472(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "PopAsync during ScrollToAsync throws NullReferenceException";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue35472PopAsyncDuringAnimatedScrollToAsync()
+		{
+			try
+			{
+				RunningApp.WaitForElement("PushButton");
+				RunningApp.Tap("PushButton");
+
+				RunningApp.WaitForElement("NowPushButton");
+				RunningApp.Screenshot("On Page With ScrollView");
+				RunningApp.Tap("NowPushButton");
+
+				RunningApp.WaitForNoElement("The test has passed");
+				RunningApp.Screenshot("Success");
+			}
+			finally
+			{
+				RunningApp.Back();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35477.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35477.cs
new file mode 100644
index 000000000000..255004e0fc12
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35477.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla35477 : IssuesUITest
+	{
+		public Bugzilla35477(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Tapped event does not fire when added to Frame in Android AppCompat";
+
+		[Test]
+		[Category(UITestCategories.Frame)]
+		[Category(UITestCategories.Gestures)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void TapGestureFiresOnFrame()
+		{
+			RunningApp.WaitForNoElement("No taps yet");
+			RunningApp.WaitForElement("TapHere");
+			RunningApp.Tap("TapHere");
+			RunningApp.WaitForNoElement("Frame was tapped");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35733.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35733.cs
new file mode 100644
index 000000000000..21f70f3b9e62
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35733.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla35733 : IssuesUITest
+	{
+		public Bugzilla35733(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "iOS WebView crashes when loading an URL with encoded parameters";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla35733Test()
+		{
+			RunningApp.WaitForElement("btnGo");
+			RunningApp.Tap("btnGo");
+			RunningApp.WaitForElement("WebViewTest");
+			RunningApp.Screenshot("I didn't crash");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35736.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35736.cs
new file mode 100644
index 000000000000..aa1c98159f7f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla35736.cs
@@ -0,0 +1,28 @@
+#if IOS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla35736 : IssuesUITest
+	{
+		public Bugzilla35736(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Editor does not update Text value from autocorrect when losing focus";
+
+		[Test]
+		[Category(UITestCategories.Editor)]
+		[FailsOnIOS("Fails sometimes")]
+		public void Bugzilla35736Test()
+		{
+			RunningApp.WaitForElement("Bugzilla35736Editor");
+			RunningApp.EnterText("Bugzilla35736Editor", "Testig");
+			RunningApp.Tap("Bugzilla35736Button");
+			ClassicAssert.AreEqual("Testing", RunningApp.FindElement("Bugzilla35736Label").GetText());
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36009.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36009.cs
new file mode 100644
index 000000000000..4cd4972cc2f3
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36009.cs
@@ -0,0 +1,25 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla36009 : IssuesUITest
+	{
+		public Bugzilla36009(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+
+		[Test]
+		[Category(UITestCategories.BoxView)]
+		[FailsOnAndroid("The content is not visible. The test is failing.")]
+		[FailsOnIOS]
+		public void Bugzilla36009Test()
+		{
+			RunningApp.WaitForElement("Victory");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36559.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36559.cs
new file mode 100644
index 000000000000..d15e3161a21f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36559.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla36559 : IssuesUITest
+	{
+		public Bugzilla36559(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[WP] Navigating to a ContentPage with a Grid inside a TableView affects Entry heights";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[Category(UITestCategories.TableView)]
+		[FailsOnIOS]
+		public void Bugzilla36559Test()
+		{
+			RunningApp.WaitForElement("entry");
+			var result = RunningApp.WaitForElement("entry");
+			ClassicAssert.AreNotEqual(result.GetRect().Height, -1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36703.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36703.cs
new file mode 100644
index 000000000000..661afc455a8b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36703.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla36703 : IssuesUITest
+	{
+		const string TestImage = "testimage";
+		const string Success = "Success";
+		const string Toggle = "toggle";
+		const string Testing = "Testing...";
+
+		public Bugzilla36703(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "TapGestureRecognizer inside initially disable Image will never fire Tapped event";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[FailsOnIOS]
+		public void _36703Test()
+		{
+			RunningApp.WaitForElement(TestImage);
+			RunningApp.Tap(TestImage);
+			RunningApp.WaitForNoElement(Testing);
+			RunningApp.Tap(Toggle);
+			RunningApp.Tap(TestImage);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36780.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36780.cs
new file mode 100644
index 000000000000..5799d5761a85
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36780.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla36780 : IssuesUITest
+	{
+		const string TestImage = "TestImage";
+		const string Gesture1Success = "Gesture1Success";
+		const string Gesture2Success = "Gesture2Success";
+		const string Gesture3Success = "Gesture3Success";
+
+		public Bugzilla36780(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Multiple TapGestureRecognizers on an Object Are Not Fired";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[FailsOnIOS]
+		public void MultipleTapGestures()
+		{
+			RunningApp.WaitForElement(TestImage);
+			RunningApp.Tap(TestImage);
+
+			RunningApp.WaitForNoElement(Gesture1Success);
+			RunningApp.WaitForNoElement(Gesture2Success);
+			RunningApp.WaitForNoElement(Gesture3Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36788.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36788.cs
new file mode 100644
index 000000000000..47fc9048891e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36788.cs
@@ -0,0 +1,25 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla36788 : IssuesUITest
+	{
+		public Bugzilla36788(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Truncation Issues with Relative Layouts";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla36788Test()
+		{
+			RunningApp.WaitForNoElement("Passed");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36802.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36802.cs
new file mode 100644
index 000000000000..db38a140a53c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla36802.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla36802 : IssuesUITest
+	{
+		public Bugzilla36802(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] AccessoryView Partially Hidden When Using RecycleElement and GroupShortName";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla36802Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("AccessoryView partially hidden test");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla37625.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla37625.cs
new file mode 100644
index 000000000000..08c122527841
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla37625.cs
@@ -0,0 +1,21 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla37625 : IssuesUITest
+	{
+		public Bugzilla37625(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "App crashes when quickly adding/removing Image views (Windows UWP)";
+
+		[Test]
+		[Category(UITestCategories.Image)]
+		public void Bugzilla37625Test()
+		{
+			RunningApp.WaitForElement("success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38723.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38723.cs
new file mode 100644
index 000000000000..57fa2bf338b7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38723.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla38723 : IssuesUITest
+	{
+		public Bugzilla38723(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Update Content in Picker's SelectedIndexChanged event causes NullReferenceException";
+
+		[Test]
+		[Category(UITestCategories.Picker)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla38723Test()
+		{
+			RunningApp.Tap("SELECT");
+			RunningApp.WaitForNoElement("Selected");
+			RunningApp.WaitForNoElement("SELECT");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38989.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38989.cs
new file mode 100644
index 000000000000..273846eafd3d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla38989.cs
@@ -0,0 +1,25 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla38989 : IssuesUITest
+	{
+		const string Success = "If you can see this, the test passed.";
+
+		public Bugzilla38989(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] NullReferenceException when using a custom ViewCellRenderer ";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		public void Bugzilla38989Test()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39489.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39489.cs
new file mode 100644
index 000000000000..95973e71520b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39489.cs
@@ -0,0 +1,38 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla39489 : IssuesUITest
+	{
+		public Bugzilla39489(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Memory leak when using NavigationPage with Maps";
+
+		[Test]
+		[Category(UITestCategories.Maps)]
+		[Category(UITestCategories.Performance)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public async Task Bugzilla39489Test()
+		{
+			// Original bug report (https://bugzilla.xamarin.com/show_bug.cgi?id=39489) had a crash (OOM) after 25-30
+			// page loads. Obviously it's going to depend heavily on the device and amount of available memory, but
+			// if this starts failing before 50 we'll know we've sprung another serious leak
+			int iterations = 50;
+
+			for (int n = 0; n < iterations; n++)
+			{
+				RunningApp.WaitForElement("NewPage");
+				RunningApp.Tap("NewPage");
+				RunningApp.WaitForElement("NewPage");
+				await Task.Delay(1000);
+				RunningApp.Back();
+			}
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39636.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39636.cs
new file mode 100644
index 000000000000..d01c9e668e25
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39636.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla39636 : IssuesUITest
+	{
+		public Bugzilla39636(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Cannot use XamlC with OnPlatform in resources, it throws System.InvalidCastException";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void DoesNotCrash()
+		{ 
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39668.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39668.cs
new file mode 100644
index 000000000000..e7c1e29f4244
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39668.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla39668 : IssuesUITest
+	{
+		public Bugzilla39668(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Overriding ListView.CreateDefault Does Not Work on Windows";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla39668Test()
+		{
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39702.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39702.cs
new file mode 100644
index 000000000000..170e24f33a41
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39702.cs
@@ -0,0 +1,30 @@
+
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla39702 : IssuesUITest
+	{
+		const string TheEntry = "TheEntry";
+		const string Success = "Success";
+
+		public Bugzilla39702(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Cannot enter text when Entry is focus()'d from an editor completed event";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[Category(UITestCategories.Focus)]
+		[FailsOnIOS]
+		public async Task ControlCanBeFocusedByUnfocusedEvent()
+		{
+			RunningApp.WaitForElement(TheEntry);
+			await Task.Delay(4000);
+			RunningApp.EnterText(TheEntry, Success); // Should be typing into the Entry at this point
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39821.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39821.cs
new file mode 100644
index 000000000000..e7d28a84b735
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla39821.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla39821 : IssuesUITest
+	{
+		public Bugzilla39821(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ViewExtension.TranslateTo cannot be invoked on Main thread";
+
+		[Test]
+		[Category(UITestCategories.Animation)]
+		[Ignore("Fails intermittently")]
+		public void DoesNotCrash()
+		{
+			RunningApp.Tap("Animate");
+			RunningApp.WaitForNoElement("Success", timeout: TimeSpan.FromSeconds(25));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla40005.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla40005.cs
new file mode 100644
index 000000000000..1c8ad57ad5aa
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla40005.cs
@@ -0,0 +1,35 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla40005 : IssuesUITest
+	{
+		public const string GoToPage2 = "Go to Page 2";
+		public const string PageOneLabel = "Page 1";
+		public const string PageTwoLabel = "Page 2";
+
+		public Bugzilla40005(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Navigation Bar back button does not show when using InsertPageBefore";
+		public override bool ResetMainPage => false;
+
+		// Crashing when navigating
+		/*
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla40005Test()
+		{
+			RunningApp.WaitForElement(PageOneLabel);
+			RunningApp.Tap(GoToPage2);
+			RunningApp.WaitForElement(PageTwoLabel);
+			RunningApp.Back();
+			RunningApp.WaitForElement(PageOneLabel);
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41205.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41205.cs
new file mode 100644
index 000000000000..26cb7725dea2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41205.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla41205 : IssuesUITest
+	{
+		const string Success = "Pass";
+
+		public Bugzilla41205(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "UWP CreateDefault passes string instead of object";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void CreateDefaultPassesStringInsteadOfObject()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41600.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41600.cs
new file mode 100644
index 000000000000..c5456e4b0973
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41600.cs
@@ -0,0 +1,35 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla41600 : IssuesUITest
+	{
+		const string BtnScrollToNonExistentItem = "btnScrollToNonExistentItem";
+		const string BtnScrollToExistentItem = "btnScrollToExistentItem";
+		const string FirstListItem = "0";
+		const string MiddleListItem = "15";
+
+		public Bugzilla41600(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Invalid item param value for ScrollTo throws an error";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		public void Bugzilla41600Test()
+		{
+			RunningApp.WaitForElement(BtnScrollToNonExistentItem);
+			RunningApp.WaitForElement(BtnScrollToExistentItem);
+
+			RunningApp.Tap(BtnScrollToNonExistentItem);
+			RunningApp.WaitForNoElement(FirstListItem);
+
+			RunningApp.Tap(BtnScrollToExistentItem);
+			RunningApp.WaitForNoElement(MiddleListItem);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41619.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41619.cs
new file mode 100644
index 000000000000..5a5f0320d288
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41619.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla41619 : IssuesUITest
+	{
+		const double Success = 6;
+
+		public Bugzilla41619(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[WinRT/UWP] Slider binding works incorrectly";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnIOS]
+		public void SliderBinding()
+		{
+			RunningApp.WaitForNoElement(Success.ToString());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41842.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41842.cs
new file mode 100644
index 000000000000..c2888fcccc27
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla41842.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla41842 : IssuesUITest
+	{
+		public Bugzilla41842(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Set FlyoutPage.Detail = New Page() twice will crash the application when set FlyoutLayoutBehavior = FlyoutLayoutBehavior.Split";
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Ignore("The sample is crashing.")]
+		[Category(UITestCategories.FlyoutPage)]
+		[FailsOnAllPlatforms("The sample is crashing. More information: https://github.com/dotnet/maui/issues/21205")]
+		public void Bugzilla41842Test()
+		{
+			RunningApp.WaitForElement("Success");
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42277.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42277.cs
new file mode 100644
index 000000000000..8726435fe856
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42277.cs
@@ -0,0 +1,35 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla42277 : IssuesUITest
+	{
+		const string Success1 = "Success1";
+		const string Success2 = "Success2";
+		const string Success3 = "GroupedSuccess3";
+		const string Success4 = "GroupedSuccess4";
+		const string Success5 = "GroupedSuccess5";
+		const string Success6 = "GroupedSuccess6";
+
+		public Bugzilla42277(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "DataTemplate System.InvalidCastException crash in 2.3.1-pre1";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla42277Test()
+		{
+			RunningApp.WaitForElement(Success1);
+			RunningApp.WaitForElement(Success2);
+			RunningApp.WaitForElement(Success3);
+			RunningApp.WaitForElement(Success4);
+			RunningApp.WaitForElement(Success5);
+			RunningApp.WaitForElement(Success6);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42956.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42956.cs
new file mode 100644
index 000000000000..f38749b94674
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla42956.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla42956 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Bugzilla42956(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+
+		// Crash after navigating
+		/*
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla42956Test()
+		{
+			RunningApp.WaitForElement(Success);
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla43519.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla43519.cs
new file mode 100644
index 000000000000..146a09320577
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla43519.cs
@@ -0,0 +1,33 @@
+#if WINDOWS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla43519 : IssuesUITest
+	{
+		const string Pop = "PopModal";
+		const string Push = "PushModal";
+		const string Page2 = "Page 2";
+
+		public Bugzilla43519(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] FlyoutPage ArgumentException when nested in a TabbedPage and returning from modal page";
+
+		[Test]
+		[Category(UITestCategories.TabbedPage)]
+		public void TabbedModalNavigation()
+		{
+			RunningApp.WaitForElement(Page2);
+			RunningApp.Tap(Page2);
+			RunningApp.WaitForElement(Push);
+			RunningApp.Tap(Push);
+			RunningApp.WaitForElement(Pop);
+			RunningApp.Tap(Pop);
+			RunningApp.WaitForElement(Page2);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44096.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44096.cs
new file mode 100644
index 000000000000..8e54c74b8122
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44096.cs
@@ -0,0 +1,99 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla44096 : IssuesUITest
+	{
+		public Bugzilla44096(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue =>
+			"Grid, StackLayout, and ContentView still participate in hit testing on Android after IsEnabled is set to false";
+
+		/*
+		const string StackLayout = "stackLayout";
+		const string ContentView = "contentView";
+		const string Grid = "grid";
+		const string RelativeLayout = "relativeLayout";
+
+		const string Child = "Child";
+		const string ToggleColor = "color";
+		const string ToggleIsEnabled = "disabled";
+		const string Original = "Original";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void TestGrid()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			TestControl(Grid);
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void TestContentView()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			TestControl(ContentView);
+		}
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void TestStackLayout()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			TestControl(StackLayout);
+		}
+
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAllPlatforms]
+		public void TestRelativeLayout()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			TestControl(RelativeLayout);
+		}
+
+		void TestControl(string control)
+		{
+			RunningApp.WaitForElement(control);
+			RunningApp.Tap(control);
+			RunningApp.WaitForNoElement(Child);
+
+			RunningApp.WaitForElement(ToggleColor);
+			RunningApp.Tap(ToggleColor);
+
+			RunningApp.WaitForElement(control);
+			RunningApp.Tap(control);
+			RunningApp.WaitForNoElement(Child);
+
+			RunningApp.WaitForElement(ToggleIsEnabled);
+			RunningApp.Tap(ToggleIsEnabled);
+
+			RunningApp.WaitForElement(control);
+			RunningApp.Tap(control);
+			RunningApp.WaitForNoElement(Original);
+
+			RunningApp.WaitForElement(ToggleColor);
+			RunningApp.Tap(ToggleColor);
+
+			RunningApp.WaitForElement(control);
+			RunningApp.Tap(control);
+			RunningApp.WaitForNoElement(Original);
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44176.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44176.cs
new file mode 100644
index 000000000000..de516d315dce
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44176.cs
@@ -0,0 +1,78 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla44176 : IssuesUITest
+	{
+		public Bugzilla44176(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "InputTransparent fails if BackgroundColor not explicitly set on Android";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla44176Test()
+		{
+			RunningApp.WaitForElement("grid");
+			RunningApp.Tap("grid");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("contentView");
+			RunningApp.Tap("contentView");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("stackLayout");
+			RunningApp.Tap("stackLayout");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("color");
+			RunningApp.Tap("color");
+
+			RunningApp.WaitForElement("grid");
+			RunningApp.Tap("grid");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("contentView");
+			RunningApp.Tap("contentView");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("stackLayout");
+			RunningApp.Tap("stackLayout");
+			RunningApp.WaitForNoElement("Parent");
+
+			RunningApp.WaitForElement("nontransparent");
+			RunningApp.Tap("nontransparent");
+
+			RunningApp.WaitForElement("grid");
+			RunningApp.Tap("grid");
+			RunningApp.WaitForNoElement("Child");
+
+			RunningApp.WaitForElement("contentView");
+			RunningApp.Tap("contentView");
+			RunningApp.WaitForNoElement("Child");
+
+			RunningApp.WaitForElement("stackLayout");
+			RunningApp.Tap("stackLayout");
+			RunningApp.WaitForNoElement("Child");
+
+			RunningApp.WaitForElement("color");
+			RunningApp.Tap("color");
+
+			RunningApp.WaitForElement("grid");
+			RunningApp.Tap("grid");
+			RunningApp.WaitForNoElement("Child");
+
+			RunningApp.WaitForElement("contentView");
+			RunningApp.Tap("contentView");
+			RunningApp.WaitForNoElement("Child");
+
+			RunningApp.WaitForElement("stackLayout");
+			RunningApp.Tap("stackLayout");
+			RunningApp.WaitForNoElement("Child");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44476.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44476.cs
new file mode 100644
index 000000000000..3388ccef9810
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla44476.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla44476 : IssuesUITest
+	{
+		public Bugzilla44476(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue44476TestUnwantedMargin()
+		{
+			RunningApp.WaitForNoElement("This should be visible.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45702.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45702.cs
new file mode 100644
index 000000000000..6f28884e0df5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45702.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla45702 : IssuesUITest
+	{
+		public Bugzilla45702(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Disabling back press on modal page causes app to crash";
+		public override bool ResetMainPage => false;
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			RunningApp.ResetApp();
+		}
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue45702Test()
+		{
+			RunningApp.WaitForElement("ClickMe");
+			RunningApp.Tap("ClickMe");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45722.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45722.cs
new file mode 100644
index 000000000000..554dedb7a668
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla45722.cs
@@ -0,0 +1,36 @@
+#if WINDOWS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla45722 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string Update = "Update List";
+		const string Collect = "GC";
+
+		public Bugzilla45722(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Memory leak in Xamarin Forms ListView";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[Category(UITestCategories.ListView)]
+		public void LabelsInListViewTemplatesShouldBeCollected()
+		{
+			RunningApp.WaitForElement(Update);
+
+			for (int n = 0; n < 10; n++)
+			{
+				RunningApp.Tap(Update);
+			}
+
+			RunningApp.Tap(Collect);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla46458.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla46458.cs
new file mode 100644
index 000000000000..4ca0556a0bac
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla46458.cs
@@ -0,0 +1,41 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla46458 : IssuesUITest
+	{
+		public Bugzilla46458(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Grid.IsEnabled property is not working";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void GridIsEnabled()
+		{
+			RunningApp.WaitForElement("entry");
+			RunningApp.Tap("entry");
+			RunningApp.WaitForNoElement("Success");
+
+			RunningApp.WaitForElement("button");
+			RunningApp.Tap("button");
+			RunningApp.WaitForNoElement("Success");
+
+			RunningApp.WaitForElement("button1");
+			RunningApp.Tap("button1");
+			RunningApp.WaitForElement("Clicked");
+
+			RunningApp.WaitForElement("entry");
+			RunningApp.Tap("entry");
+			RunningApp.WaitForNoElement("Success");
+
+			RunningApp.WaitForElement("button");
+			RunningApp.Tap("button");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla49069.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla49069.cs
new file mode 100644
index 000000000000..966a0642aee1
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla49069.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla49069 : IssuesUITest
+	{
+		public Bugzilla49069(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Java.Lang.ArrayIndexOutOfBoundsException when rendering long Label on Android";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void Bugzilla49069Test()
+		{
+			RunningApp.WaitForElement("lblLong");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51238.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51238.cs
new file mode 100644
index 000000000000..3437f10a6709
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51238.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla51238 : IssuesUITest
+	{
+		public Bugzilla51238(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Transparent Grid causes Java.Lang.IllegalStateException: Unable to create layer for Platform_DefaultRenderer";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue1Test()
+		{
+			RunningApp.WaitForElement("TapMe");
+			RunningApp.Tap("TapMe"); // Crashes the app if the issue isn't fixed
+			RunningApp.WaitForElement("TapMe");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51503.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51503.cs
new file mode 100644
index 000000000000..277c774f4093
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51503.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla51503 : IssuesUITest
+	{
+		public Bugzilla51503(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NullReferenceException on VisualElement Finalize";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		public void Issue51503Test()
+		{
+			for (int i = 0; i < 3; i++)
+			{
+				RunningApp.WaitForElement("Button");
+
+				RunningApp.Tap("Button");
+
+				RunningApp.WaitForElement("VisualElement");
+
+				RunningApp.Back();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51505.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51505.cs
new file mode 100644
index 000000000000..14c89a101be8
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla51505.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla51505 : IssuesUITest
+	{
+		const string ButtonId = "button";
+
+		public Bugzilla51505(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ObjectDisposedException On Effect detachment.";
+
+		[Test]
+		[Category(UITestCategories.Button)]
+		[Category(UITestCategories.Effects)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla51505Test()
+		{
+			RunningApp.WaitForElement(ButtonId);
+			Assert.DoesNotThrow(() => RunningApp.Tap(ButtonId));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla52533.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla52533.cs
new file mode 100644
index 000000000000..f61461ba7517
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla52533.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla52533 : IssuesUITest
+	{
+		const string LabelId = "label";
+
+		public Bugzilla52533(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "System.ArgumentException: NaN is not a valid value for width";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void Bugzilla52533Test()
+		{
+			RunningApp.WaitForElement(LabelId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53179.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53179.cs
new file mode 100644
index 000000000000..bee4ef33fa06
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53179.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla53179 : IssuesUITest
+	{
+		public Bugzilla53179(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "PopAsync crashing after RemovePage when support packages are updated to 25.1.1";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		public void Bugzilla53179Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("Next Page");
+			RunningApp.Tap("Next Page");
+
+			RunningApp.WaitForElement("Next Page");
+			RunningApp.Tap("Next Page");
+
+			RunningApp.WaitForElement("Next Page");
+			RunningApp.Tap("Next Page");
+
+			RunningApp.WaitForElement("Remove previous pages");
+			RunningApp.Tap("Remove previous pages");
+
+			RunningApp.WaitForElement("Back");
+			RunningApp.Tap("Back");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53445.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53445.cs
new file mode 100644
index 000000000000..db8f91868a76
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53445.cs
@@ -0,0 +1,37 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla53445 : IssuesUITest
+	{
+		public Bugzilla53445(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Setting Grid.IsEnabled to false does not disable child controls";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void Test()
+		{
+			RunningApp.WaitForElement("Success");
+
+			// Disable the layouts
+			RunningApp.Tap("toggle");
+
+			// Tap the grid button; the event should not fire and the label should not change
+			RunningApp.Tap("gridbutton");
+			RunningApp.WaitForElement("Success");
+
+			// Tap the contentview button; the event should not fire and the label should not change
+			RunningApp.Tap("contentviewbutton");
+			RunningApp.WaitForElement("Success");
+
+			// Tap the stacklayout button; the event should not fire and the label should not change
+			RunningApp.Tap("stacklayoutbutton");
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53834.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53834.cs
new file mode 100644
index 000000000000..82c1011b2e1a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla53834.cs
@@ -0,0 +1,26 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla53834 : IssuesUITest
+	{
+		public Bugzilla53834(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "incorrect row heights on ios when using groupheadertemplate in Xamarin.Forms 2.3.4.214-pre5";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla53834Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("Incorrect row heights test");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55365.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55365.cs
new file mode 100644
index 000000000000..599e727bf5fb
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55365.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla55365 : IssuesUITest
+	{
+		public Bugzilla55365(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "~VisualElement crashes with System.Runtime.InteropServices.COMException";
+
+		[Test]
+		[Category(UITestCategories.ViewBaseTests)]
+		[FailsOnIOS]
+		public void ForcingGCDoesNotCrash()
+		{
+			RunningApp.WaitForElement("Clear");
+			RunningApp.Tap("Clear");
+			RunningApp.Tap("Garbage");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55745.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55745.cs
new file mode 100644
index 000000000000..2686e1c98da7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55745.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla55745 : IssuesUITest
+	{
+		const string ButtonId = "button";
+
+		public Bugzilla55745(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] NRE in ListView with HasUnevenRows=true after changing content and rebinding";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla55745Test()
+		{
+			RunningApp.WaitForElement(ButtonId);
+			RunningApp.Tap(ButtonId);
+			RunningApp.Tap(ButtonId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55912.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55912.cs
new file mode 100644
index 000000000000..226124b68b1d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla55912.cs
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla55912 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string GridLabelId = "GridLabel";
+		const string StackLabelId = "StackLabel";
+
+		public Bugzilla55912(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Tap event not always propagated to containing Grid/StackLayout";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void GestureBubblingInStackLayout()
+		{
+			RunningApp.WaitForElement(StackLabelId);
+			RunningApp.Tap(StackLabelId);
+			RunningApp.WaitForElement(Success);
+		}
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void GestureBubblingInGrid()
+		{
+			RunningApp.WaitForElement(GridLabelId);
+			RunningApp.Tap(GridLabelId);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56298.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56298.cs
new file mode 100644
index 000000000000..773e1b614ac3
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56298.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla56298 : IssuesUITest
+	{
+		public Bugzilla56298(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Changing ListViews HasUnevenRows at runtime on iOS has no effect";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla56298Test()
+		{
+			RunningApp.WaitForElement("btnAdd");
+			RunningApp.Tap("btnAdd");
+			RunningApp.Tap("btnToggle");
+			RunningApp.Screenshot("Verify we see uneven rows");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56771.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56771.cs
new file mode 100644
index 000000000000..63280bfb2f98
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56771.cs
@@ -0,0 +1,29 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla56771 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string BtnAdd = "btnAdd";
+
+		public Bugzilla56771(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Multi-item add in INotifyCollectionChanged causes a NSInternalInconsistencyException in bindings on iOS";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla56771Test()
+		{
+			RunningApp.WaitForElement(BtnAdd);
+			RunningApp.Tap(BtnAdd);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56896.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56896.cs
new file mode 100644
index 000000000000..b9d422fdb4af
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla56896.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla56896 : IssuesUITest
+	{
+		const string InstructionsId = "InstructionsId";
+		const string ConstructorCountId = "constructorCount";
+		const string TimeId = "time";
+
+		public Bugzilla56896(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListViews for lists with many elements regressed in performance on iOS";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void ListViewsWithManyElementsPerformanceCheck()
+		{
+			RunningApp.WaitForElement(InstructionsId);
+			RunningApp.WaitForElement(ConstructorCountId);
+			RunningApp.WaitForElement(TimeId);
+			int.TryParse(RunningApp.WaitForElement(ConstructorCountId).GetText(), out int count);
+			ClassicAssert.IsTrue(count < 100); // Failing test makes ~15000 constructor calls
+			int.TryParse(RunningApp.WaitForElement(TimeId).GetText(), out int time);
+			ClassicAssert.IsTrue(count < 2000); // Failing test takes ~4000ms
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57114.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57114.cs
new file mode 100644
index 000000000000..ba149cfd0406
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57114.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla57114 : IssuesUITest
+	{
+		const string Testing = "Testing...";
+		const string Success = "Success";
+		const string ViewAutomationId = "_57114View";
+
+		public Bugzilla57114(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Forms gestures are not supported on UIViews that have native gestures";
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void _57114BothTypesOfGesturesFire()
+		{
+			RunningApp.WaitForNoElement(Testing);
+			RunningApp.Tap(ViewAutomationId);
+			RunningApp.WaitForNoElement(Success);
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57674.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57674.cs
new file mode 100644
index 000000000000..aa9999e80781
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57674.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla57674 : IssuesUITest
+	{
+		public Bugzilla57674(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView not honoring INotifyCollectionChanged";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Bugzilla57674Test()
+		{
+			RunningApp.Screenshot("Initial Status");
+			RunningApp.WaitForElement("IssueListView");
+			RunningApp.Tap("IssueButton");
+			RunningApp.Screenshot("Element Added to List");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57758.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57758.cs
new file mode 100644
index 000000000000..5bd743079605
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57758.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla57758 : IssuesUITest
+	{
+		const string ImageId = "TestImageId";
+
+		public Bugzilla57758(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ObjectDisposedException for Microsoft.Maui.Controls.Platform.Android.FastRenderers.ImageRenderer";
+
+		[Test]
+		[Category(UITestCategories.Image)]
+		[FailsOnIOS]
+		public void RemovingImageWithGestureFromLayoutWithinGestureHandlerDoesNotCrash()
+		{
+			RunningApp.WaitForElement(ImageId);
+			RunningApp.Tap(ImageId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57910.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57910.cs
new file mode 100644
index 000000000000..9e70790dc345
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla57910.cs
@@ -0,0 +1,38 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla57910 : IssuesUITest
+	{
+		const string ButtonId = "btnPush";
+		const string Button2Id = "btnPop";
+
+		public Bugzilla57910(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+		public override bool ResetMainPage => false;
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		public void Bugzilla57910Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			for (int i = 0; i < 10; i++)
+			{
+				RunningApp.WaitForElement(ButtonId);
+				RunningApp.Tap(ButtonId);
+				RunningApp.WaitForElement(Button2Id);
+				RunningApp.Tap(Button2Id);
+			}
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla58645.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla58645.cs
new file mode 100644
index 000000000000..44a92134606b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla58645.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla58645 : IssuesUITest
+	{
+		const string ButtonId = "button";
+
+		public Bugzilla58645(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] NRE Thrown When ListView Items Are Replaced By Items With a Different Template";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla58645Test()
+		{
+			RunningApp.WaitForElement(ButtonId);
+			RunningApp.Tap(ButtonId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59097.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59097.cs
new file mode 100644
index 000000000000..3cb2cef3a705
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59097.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla59097 : IssuesUITest
+	{
+		public Bugzilla59097(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Calling PopAsync via TapGestureRecognizer causes an application crash";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		public void Bugzilla59097Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("boxView");
+			RunningApp.Tap("boxView");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59172.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59172.cs
new file mode 100644
index 000000000000..be10309e58b0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59172.cs
@@ -0,0 +1,52 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla59172 : IssuesUITest
+	{
+		public Bugzilla59172(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Popped page does not appear on top of current navigation stack, please file a bug.";
+		public override bool ResetMainPage => false;
+
+		// Test scenario: Tapping the GoBack link triggers a PopAsync 2500ms after the tap event.
+		//   Right before PopAsync is triggered, manually navigate back pressing the back arrow in the navigation bar
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public async Task Issue59172Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("GoForward");
+			RunningApp.Tap("GoBackDelayed");
+			RunningApp.Back();
+
+			await Task.Delay(1000);
+
+			// App should not have crashed
+			RunningApp.WaitForElement("GoForward");
+		}
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public async Task Issue59172RecoveryTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("GoForward");
+			RunningApp.Tap("GoBackDelayedSafe");
+			RunningApp.Back();
+
+			await Task.Delay(1000);
+
+			RunningApp.Tap("GoForward");
+
+			// App should navigate
+			RunningApp.WaitForElement("GoBackDelayedSafe");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59896.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59896.cs
new file mode 100644
index 000000000000..b32e1da30032
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59896.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla59896 : IssuesUITest
+	{
+		const string BtnAdd = "btnAdd";
+
+		public Bugzilla59896(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "v2.4.0: Adding inserting section to ListView causes crash IF first section is empty";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Bugzilla59896Test()
+		{
+			RunningApp.WaitForElement(BtnAdd);
+			RunningApp.Tap(BtnAdd);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59925.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59925.cs
new file mode 100644
index 000000000000..36bec1bb212c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla59925.cs
@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Bugzilla59925 : IssuesUITest
+	{
+		public Bugzilla59925(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Font size does not change vertical height of Entry on iOS";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void Issue123456Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("I am at Issue 59925");
+			RunningApp.WaitForElement("Bigger");
+			RunningApp.Screenshot("0");
+
+			RunningApp.Tap("Bigger");
+			RunningApp.Screenshot("1");
+
+			RunningApp.Tap("Bigger");
+			RunningApp.Screenshot("2");
+
+			RunningApp.Tap("Bigger");
+			RunningApp.Screenshot("3");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla60123.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla60123.cs
new file mode 100644
index 000000000000..ed49eba725c7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Bugzilla60123.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Bugzilla60123 : IssuesUITest
+	{
+		public Bugzilla60123(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Rui's issue";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue1Test()
+		{
+			RunningApp.WaitForElement("ListView");
+			RunningApp.ScrollDown("ListView");
+			RunningApp.WaitForElement("ListView");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1567.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1567.cs
new file mode 100644
index 000000000000..74cbe866bbb2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1567.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class GitHub1567 : IssuesUITest
+	{
+		public GitHub1567(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NRE using TapGestureRecognizer on cell with HasUnevenRows";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		public void GitHub1567Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("btnFillData");
+			RunningApp.Tap("btnFillData");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1648.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1648.cs
new file mode 100644
index 000000000000..c0299cdeb16c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/GitHub1648.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class GitHub1648 : IssuesUITest
+	{
+		public GitHub1648(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "FlyoutPage throws ArgumentOutOfRangeException";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void GitHub1648Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForElement("Reload");
+			RunningApp.Tap("Reload");
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github1625.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github1625.cs
new file mode 100644
index 000000000000..df2e87a21b91
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github1625.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Github1625 : IssuesUITest
+	{
+		public Github1625(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Slider value is not changed for the first position change";
+
+		[Test]
+		[Category(UITestCategories.Slider)]
+		public void SettingSliderToSpecificValueWorks()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("LabelValue");
+			ClassicAssert.AreEqual("5", RunningApp.WaitForElement("LabelValue").GetText());
+			RunningApp.Tap("SetTo7");
+			ClassicAssert.AreEqual("7", RunningApp.WaitForElement("LabelValue").GetText());
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github6384.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github6384.cs
new file mode 100644
index 000000000000..6c523ac033fd
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Github6384.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Github6384 : IssuesUITest
+	{
+		public Github6384(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "content page in tabbed page not showing inside shell tab";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Github6384Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("I am at Github6384");
+			RunningApp.WaitForElement("NavigationButton");
+			RunningApp.Tap("NavigationButton");
+			RunningApp.WaitForElement("SubTabLabel1");
+			// The label is visible!
+			// Note: This check only catches the bug on iOS. Android will pass also without the fix.
+			RunningApp.Screenshot("The new page is visible!");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10182.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10182.cs
new file mode 100644
index 000000000000..212ce5891c90
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10182.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue10182 : IssuesUITest
+	{
+		public Issue10182(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid("MultiWindowService not implemented.")]
+		[FailsOnIOS]
+		public void AppDoesntCrashWhenResettingPage()
+		{
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10222.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10222.cs
new file mode 100644
index 000000000000..2965bf333fe5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10222.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue10222 : IssuesUITest
+	{
+		public Issue10222(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+		public override bool ResetMainPage => false;
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		public void Issue10222Test()
+		{
+			RunningApp.WaitForElement("goTo");
+			RunningApp.Tap("goTo");
+			RunningApp.WaitForElement("collectionView");
+			RunningApp.WaitForElement("goTo");
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1023.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1023.cs
new file mode 100644
index 000000000000..6b85ad0fc51d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1023.cs
@@ -0,0 +1,39 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1023 : IssuesUITest
+	{
+		public Issue1023(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Exception Ancestor must be provided for all pushes except first";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[Category(UITestCategories.Picker)]
+		[FailsOnIOS]
+		public void Bugzilla1023Test()
+		{
+			for (var n = 0; n < 10; n++)
+			{
+				RunningApp.WaitForElement("Push");
+				RunningApp.Tap("Push");
+
+				RunningApp.WaitForElement("ListView");
+				RunningApp.Back();
+			}
+
+			// At this point, the counter can be any value, but it's most likely not zero.
+			// Invoking GC once is enough to clean up all garbage data and set counter to zero
+			RunningApp.WaitForElement("GC");
+			RunningApp.Tap("GC");
+
+			RunningApp.WaitForNoElement("Counter: 0");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10234.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10234.cs
new file mode 100644
index 000000000000..a28a56e73340
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10234.cs
@@ -0,0 +1,44 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue10234 : IssuesUITest
+	{
+		public Issue10234(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "CarouselView disposed on iOS when navigating back in Shell ";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		[FailsOnIOS]
+		public void ScrollCarouselViewAfterDispose()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("goToShow");
+			RunningApp.Tap("goToShow");
+			RunningApp.WaitForElement("goToBack");
+			ScrollNextItem();
+			RunningApp.Tap("goToBack");
+			RunningApp.WaitForElement("goToShow");
+			RunningApp.Tap("goToShow");
+			ScrollNextItem();
+			RunningApp.WaitForElement("goToBack");
+			RunningApp.Tap("goToBack");
+			RunningApp.WaitForElement("goToShow");
+		}
+
+		void ScrollNextItem()
+		{
+			var rect = RunningApp.FindElement("carouselView").GetRect();
+			var centerX = rect.CenterX();
+			var rightX = rect.X - 5;
+			RunningApp.DragCoordinates(centerX + 40, rect.CenterY(), rightX, rect.CenterY());
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10454.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10454.cs
new file mode 100644
index 000000000000..669088757b2b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10454.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+    public  class Issue10454 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue10454(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "CollectionView ChildAdded";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void ChildAddedShouldFire()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10563.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10563.cs
new file mode 100644
index 000000000000..a5b4b9e351a9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10563.cs
@@ -0,0 +1,50 @@
+#if ANDROID || IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+    public class Issue10563 : IssuesUITest
+	{
+		const string OpenLeftId = "OpenLeftId";
+		const string OpenRightId = "OpenRightId";
+		const string OpenTopId = "OpenTopId";
+		const string OpenBottomId = "OpenBottomId";
+		const string CloseId = "CloseId";
+
+		public Issue10563(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] SwipeView Open methods does not work for RightItems"; 
+		
+		[Test]
+		[Category(UITestCategories.SwipeView)]
+		[FailsOnIOS]
+		public void Issue10563OpenSwipeViewTest()
+		{
+			RunningApp.WaitForElement(OpenLeftId);
+			RunningApp.Tap(OpenLeftId);
+			RunningApp.Screenshot("Left SwipeItems");
+			RunningApp.Tap(CloseId);
+
+			RunningApp.WaitForElement(OpenRightId);
+			RunningApp.Tap(OpenRightId);
+			RunningApp.Screenshot("Right SwipeItems");
+
+			RunningApp.Tap(CloseId);
+
+			RunningApp.WaitForElement(OpenTopId);
+			RunningApp.Tap(OpenTopId);
+			RunningApp.Screenshot("Top SwipeItems");
+			RunningApp.Tap(CloseId);
+
+			RunningApp.WaitForElement(OpenBottomId);
+			RunningApp.Tap(OpenBottomId);
+			RunningApp.Screenshot("Bottom SwipeItems");
+			RunningApp.Tap(CloseId);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10744.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10744.cs
new file mode 100644
index 000000000000..df92af07cd4a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue10744.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+    public class Issue10744 : IssuesUITest
+	{
+		public Issue10744(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] WebView.Eval crashes on Android with long string";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[Category(UITestCategories.RequiresInternetConnection)]
+		[FailsOnAndroid]
+		public void WebViewEvalCrashesOnAndroidWithLongString()
+		{
+			RunningApp.WaitForElement("navigatedLabel");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11132.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11132.cs
new file mode 100644
index 000000000000..cba532e8c0f9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11132.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue11132 : IssuesUITest
+	{
+		const string InstructionsId = "instructions";
+
+		public Issue11132(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [iOS] UpdateClip throws NullReferenceException when the Name of the Mask of the Layer is null";
+
+		/*
+		[Test]
+		[Description("Verify that can use a CustomRenderer overriding the iOS View Layer properties")]
+		[Category(UITestCategories.Frame)]
+		[Category(UITestCategories.CustomHandlers)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue11132CustomRendererLayerAndClip()
+		{
+			RunningApp.WaitForElement(InstructionsId);
+			RunningApp.Screenshot("No crash");
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11209.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11209.cs
new file mode 100644
index 000000000000..c78df77ea082
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11209.cs
@@ -0,0 +1,30 @@
+#if ANDROID || IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+    public class Issue11209 : IssuesUITest
+	{
+		const string SwipeViewContent = "SwipeViewContent";
+		const string Success = "Success";
+
+		public Issue11209(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [iOS][SwipeView] Swipe view not handling tap gesture events until swiped";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.SwipeView)]
+		[FailsOnIOS]
+		public void TapSwipeViewAndNavigateTest()
+		{
+			RunningApp.WaitForElement(SwipeViewContent);
+			RunningApp.Tap(SwipeViewContent);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11311.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11311.cs
new file mode 100644
index 000000000000..8bcc8724c6e7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11311.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue11311 : IssuesUITest
+	{
+		public Issue11311(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Regression] CollectionView NSRangeException";
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			RunningApp.Back();
+		}
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[Category(UITestCategories.TabbedPage)]
+		public void CollectionViewWithFooterShouldNotCrashOnDisplay()
+		{
+			// If this hasn't already crashed, the test is passing
+			RunningApp.FindElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11333.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11333.cs
new file mode 100644
index 000000000000..b171c40bd66b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11333.cs
@@ -0,0 +1,31 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue11333 : IssuesUITest
+	{
+		public Issue11333(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] SwipeView does not work on Android if child has TapGestureRecognizer";
+		
+		/*
+		const string SwipeViewId = "SwipeViewId";
+
+		[Test]
+		[Category(UITestCategories.SwipeView)]
+		[FailsOnAndroid]
+		public void SwipeWithChildGestureRecognizer()
+		{
+			RunningApp.WaitForElement(SwipeViewId);
+			RunningApp.SwipeRightToLeft();
+			RunningApp.Tap(SwipeViewId);
+			RunningApp.WaitForElement("ResultLabel");
+		}
+		*/
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1146.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1146.cs
new file mode 100644
index 000000000000..2e98646c6f03
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1146.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1146 : IssuesUITest
+	{
+		public Issue1146(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Disabled Switch in Button Gallery not rendering on all devices";
+
+		[Test]
+		[Category(UITestCategories.Switch)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void TestSwitchDisable()
+		{
+			RunningApp.WaitForElement("switch");
+			RunningApp.Screenshot();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11769.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11769.cs
new file mode 100644
index 000000000000..2fe90aefbc23
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11769.cs
@@ -0,0 +1,64 @@
+/*
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue11769_DelayedShellContent : IssuesUITest
+	{
+		public Issue11769_DelayedShellContent(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Shell throws exception when delay adding Shell Content";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		[FailsOnAndroid]
+		public void DelayedAddingOfShellContentDoesntCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+
+	public class Issue11769_DelayedShellSection : IssuesUITest
+	{
+		public Issue11769_DelayedShellSection(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Shell throws exception when delay adding Shell Section";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		[FailsOnAndroid]
+		public void DelayedAddingOfShellSectionDoesntCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+
+	public class Issue11769_DelayedShellItem : IssuesUITest
+	{
+		public Issue11769_DelayedShellItem(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Shell throws exception when delay adding Shell Item";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		[FailsOnAndroid]
+		public void DelayedAddingOfShellItemDoesntCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11853.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11853.cs
index 1aa0f8291d18..25daa1c9400c 100644
--- a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11853.cs
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11853.cs
@@ -1,4 +1,3 @@
-#if IOS
 using NUnit.Framework;
 using UITest.Appium;
 
@@ -18,6 +17,8 @@ public Issue11853(TestDevice testDevice) : base(testDevice)
 		[Category(UITestCategories.CollectionView)]
 		public void JustWhalingAwayOnTheCollectionViewWithAddsAndClearsShouldNotCrash()
 		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
 			RunningApp.WaitForElement(Run);
 			RunningApp.Tap(Run);
 			Task.Delay(5000).Wait();
@@ -28,5 +29,4 @@ public void JustWhalingAwayOnTheCollectionViewWithAddsAndClearsShouldNotCrash()
 			RunningApp.WaitForElement(Run);
 		}
 	}
-}
-#endif
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11962.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11962.cs
new file mode 100644
index 000000000000..f16a3baeba39
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11962.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue11962 : IssuesUITest
+	{
+		public Issue11962(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Cannot access a disposed object. Object name: 'WkWebViewRenderer";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		public void WebViewDisposesProperly()
+		{
+			RunningApp.Tap("NextButton");
+			RunningApp.Tap("BackButton");
+			RunningApp.Tap("NextButton");
+			RunningApp.Tap("BackButton");
+			RunningApp.Tap("NextButton");
+			RunningApp.Tap("BackButton");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11969.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11969.cs
new file mode 100644
index 000000000000..2bfd4a29625a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue11969.cs
@@ -0,0 +1,35 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue11969 : IssuesUITest
+	{
+		const string SwipeViewId = "SwipeViewId";
+		const string SwipeButtonId = "SwipeButtonId";
+
+		const string Failed = "SwipeView Button not tapped";
+		const string Success = "SUCCESS";
+
+		public Issue11969(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Disabling Swipe view not handling tap gesture events on the content in iOS of Xamarin Forms";
+
+		[Test]
+		[Category(UITestCategories.SwipeView)]
+		[FailsOnIOS]
+		public void SwipeDisableChildButtonTest()
+		{
+			RunningApp.WaitForNoElement(Failed);
+			RunningApp.WaitForElement(SwipeViewId);
+			RunningApp.Tap("SwipeViewCheckBoxId");
+			RunningApp.Tap("SwipeViewContentCheckBoxId");
+			RunningApp.Tap(SwipeButtonId);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12060.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12060.cs
new file mode 100644
index 000000000000..dc2c8d184da1
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12060.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12060 : IssuesUITest
+	{
+		public Issue12060(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Bug] DragGestureRecognizer shows 'Copy' tag when dragging in UWP";
+
+		[Test]
+		[Category(UITestCategories.DragAndDrop)]
+		[FailsOnIOS]
+		public void AcceptedOperationNoneDisablesDropOperation()
+		{
+			RunningApp.WaitForElement("TestLoaded");
+			App.DragAndDrop("DragBox", "DropBox");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12079.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12079.cs
new file mode 100644
index 000000000000..2ff1a2034270
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12079.cs
@@ -0,0 +1,31 @@
+#if WINDOWS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue12079 : IssuesUITest
+	{
+		const string SwipeViewId = "SwipeViewId";
+
+		public Issue12079(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "SwipeView crash if Text not is set on SwipeItem";
+
+		[Test]
+		[Ignore("Appium cannot find the SwipeControl, we have to review the reason.")]
+		[Category(UITestCategories.SwipeView)]
+		public void SwipeItemNoTextWindows()
+		{
+			RunningApp.WaitForElement(SwipeViewId);
+			RunningApp.SwipeLeftToRight(SwipeViewId);
+			RunningApp.Tap(SwipeViewId);
+			RunningApp.WaitForNoElement("Success");
+			RunningApp.Screenshot("The test has passed");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12134.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12134.cs
new file mode 100644
index 000000000000..654748355fba
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12134.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12134 : IssuesUITest
+	{
+		public Issue12134(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] WkWebView does not handle cookies consistently";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[Category(UITestCategories.RequiresInternetConnection)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void CookiesCorrectlyLoadWithMultipleWebViews()
+		{
+			for (int i = 0; i < 10; i++)
+			{
+				RunningApp.WaitForNoElement("Success", $"Failied on: {i}");
+				RunningApp.Tap("LoadNewWebView");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12153.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12153.cs
new file mode 100644
index 000000000000..5240e3e7d3ac
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12153.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12153 : IssuesUITest
+	{
+		public Issue12153(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Setting FontFamily to pre-installed fonts on UWP crashes";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void InvalidFontDoesntCauseAppToCrash()
+		{
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1219.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1219.cs
new file mode 100644
index 000000000000..89dac2943a97
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1219.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1219 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue1219(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Setting ToolbarItems in ContentPage constructor crashes app";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void ViewCellInTableViewDoesNotCrash()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12193.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12193.cs
new file mode 100644
index 000000000000..70b2fd2321f0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12193.cs
@@ -0,0 +1,41 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12193 : IssuesUITest
+	{
+		const string HTML = "HTML";
+
+		public Issue12193(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CarouselView content disappears after 2 rotations if TextType=Html is used";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		[FailsOnIOS]
+		public async Task RotatingCarouselViewHTMLShouldNotDisappear()
+		{
+			int delay = 3000;
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationLandscape();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationLandscape();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.WaitForElement(HTML);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12246.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12246.cs
new file mode 100644
index 000000000000..10f04057922b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12246.cs
@@ -0,0 +1,37 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12246 : IssuesUITest
+	{
+		const string Entry = "Entry";
+		const string Password = "Password";
+		const string Success = "Success";
+
+		public Issue12246(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] iOS 14 App freezes when password is entered after email";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnIOS]
+		public void UnfocusingPasswordDoesNotHang()
+		{
+			RunningApp.WaitForElement(Entry);
+			RunningApp.WaitForElement(Password);
+
+			RunningApp.EnterText(Entry, "test");
+			RunningApp.DismissKeyboard();
+			RunningApp.EnterText(Password, "test");
+
+			RunningApp.Tap(Entry);
+			RunningApp.DismissKeyboard();
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1236.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1236.cs
new file mode 100644
index 000000000000..1c09a6bb7d80
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1236.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1236 : IssuesUITest
+	{
+		public Issue1236(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Label binding";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void DelayedLabelBindingShowsUp()
+		{
+			Task.Delay(2000).Wait();
+			RunningApp.WaitForNoElement("Lorem Ipsum Dolor Sit Amet");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12374.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12374.cs
new file mode 100644
index 000000000000..d60d0f0c774b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12374.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue12374 : IssuesUITest
+	{
+		public Issue12374(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] iOS XF 5.0-pre1 crash with CollectionView when using EmptyView";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void Issue12374Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Tap("RemoveItems");
+			RunningApp.Tap("AddItems");
+			RunningApp.Tap("RemoveItems");
+			RunningApp.Screenshot("CollectionViewWithEmptyView");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12484.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12484.cs
new file mode 100644
index 000000000000..d237dc2d1a06
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12484.cs
@@ -0,0 +1,24 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12484 : IssuesUITest
+	{
+		public Issue12484(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Unable to set ControlTemplate for TemplatedView in Xamarin.Forms version 5.0";
+
+		[Test]
+		[Category(UITestCategories.ViewBaseTests)]
+		[FailsOnAndroid]
+		public void Issue12484ControlTemplateRendererTest()
+		{ 
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12642.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12642.cs
new file mode 100644
index 000000000000..a9c419ff1922
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12642.cs
@@ -0,0 +1,28 @@
+/*
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12642 : IssuesUITest
+	{
+		public Issue12642(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Rapid ShellContent Navigation Causes Blank Screens";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void ClickingQuicklyBetweenTopTabsBreaksContent()
+		{
+			RunningApp.Tap("AutomatedRun");
+			RunningApp.WaitForElement("Success");
+			RunningApp.Tap("AutomatedRun");
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
+#endif
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1267.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1267.cs
new file mode 100644
index 000000000000..d6e7a1e96956
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1267.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1267 : IssuesUITest
+	{
+		const string Success = "If this is visible, the test has passed.";
+
+		public Issue1267(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Star '*' in Grid layout throws exception";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void StarInGridDoesNotCrash()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12714.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12714.cs
new file mode 100644
index 000000000000..ce2d74cfc3a5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12714.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue12714 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string Show = "Show";
+
+		public Issue12714(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] iOS application suspended at UICollectionViewFlowLayout.PrepareLayout() when using IsVisible = false";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void InitiallyInvisbleCollectionViewSurvivesiOSLayoutNonsense()
+		{
+			RunningApp.WaitForElement(Show);
+			RunningApp.Tap(Show);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12777.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12777.cs
new file mode 100644
index 000000000000..58d8d254ad9a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12777.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue12777 : IssuesUITest
+	{
+		public Issue12777(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CarouselView NRE if item template is not specified";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		[FailsOnIOS]
+		public void Issue12777Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("TestCarouselView");
+			RunningApp.Screenshot("Test passed");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12848.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12848.cs
new file mode 100644
index 000000000000..5925716697bb
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue12848.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue12848 : IssuesUITest
+	{
+		public Issue12848(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CarouselView position resets when visibility toggled";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue12848Test()
+		{
+			RunningApp.WaitForElement("TestCarouselView");
+			RunningApp.SwipeRightToLeft();
+			int.TryParse(RunningApp.FindElement("CarouselPosition").GetText(), out int position1);
+			ClassicAssert.AreEqual(1, position1);
+			RunningApp.Tap("HideButton");
+			RunningApp.Tap("ShowButton");
+			int.TryParse(RunningApp.FindElement("CarouselPosition").GetText(), out int position2);
+			ClassicAssert.AreEqual(1, position2);
+			RunningApp.Screenshot("Test passed");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13126_2.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13126_2.cs
new file mode 100644
index 000000000000..4cb940e4d1ee
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13126_2.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13126_2 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue13126_2(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Regression: 5.0.0-pre5 often fails to draw dynamically loaded collection view content";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void CollectionViewShouldSourceShouldResetWhileInvisible()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13203.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13203.cs
new file mode 100644
index 000000000000..80616e080f70
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13203.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13203 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue13203(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [iOS] CollectionView does not bind to items if `IsVisible=False`";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void CollectionShouldInvalidateOnVisibilityChange()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13390.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13390.cs
new file mode 100644
index 000000000000..d547f90980ee
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13390.cs
@@ -0,0 +1,26 @@
+/*
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13390 : IssuesUITest
+	{
+		public Issue13390(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Custom SlideFlyoutTransition is not working";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void CustomSlideFlyoutTransitionCausesCrash()
+		{
+			// If this hasn't already crashed, the test is passing
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
+#endif
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13436.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13436.cs
new file mode 100644
index 000000000000..3a0270a228f2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13436.cs
@@ -0,0 +1,23 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13436 : IssuesUITest
+	{
+		public Issue13436(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Java.Lang.IllegalArgumentException in CarouselView adjusting PeekAreaInsets in OnSizeAllocated using XF 5.0";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		public void ChangePeekAreaInsetsInOnSizeAllocatedTest()
+		{
+			RunningApp.WaitForElement("CarouselId");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13476.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13476.cs
new file mode 100644
index 000000000000..2060123bdf6f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13476.cs
@@ -0,0 +1,32 @@
+/*
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13476 : IssuesUITest
+	{
+		public Issue13476(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Shell Title View Test";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void TitleViewHeightDoesntOverflow()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			var titleView = RunningApp.WaitForElement("TitleViewId").GetRect();
+			var topTab = RunningApp.WaitForElement("page 1").GetRect();
+
+			var titleViewBottom = titleView.Y + titleView.Height;
+			var topTabTop = topTab.Y;
+
+			ClassicAssert.GreaterOrEqual(topTabTop, titleViewBottom, "Title View is incorrectly positioned behind tabs");
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1355.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1355.cs
new file mode 100644
index 000000000000..8033f364c97e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1355.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1355 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue1355(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Setting Main Page in quick succession causes crash on Android";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		public void SwitchMainPageOnAppearing()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			// Without the fix, this would crash. If we're here at all, the test passed.
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13551.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13551.cs
new file mode 100644
index 000000000000..078138a38ab1
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13551.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13551 : IssuesUITest
+	{
+		const string Success1 = "Success1";
+		const string Success2 = "Success2";
+
+		public Issue13551(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [iOS] CollectionView does not display items if `IsVisible` modified via a binding/trigger";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void CollectionViewWithFooterShouldNotCrashOnDisplay()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement(Success1);
+			RunningApp.WaitForNoElement(Success2);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13616.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13616.cs
new file mode 100644
index 000000000000..c9a5ce8162c5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13616.cs
@@ -0,0 +1,25 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13616 : IssuesUITest
+	{
+		public Issue13616(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] After updating XF 5.0.0.1931 getting Java.Lang.IllegalArgumentException: Invalid target position at Java.Interop.JniEnvironment+InstanceMethods.CallVoidMethod";
+
+		[Test]
+		[Category(UITestCategories.CarouselView)]
+		public void Issue13616Test()
+		{
+			RunningApp.WaitForElement("AddItemButtonId");
+			RunningApp.Tap("AddItemButtonId");
+			RunningApp.WaitForElement("CarouselViewId");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13916.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13916.cs
new file mode 100644
index 000000000000..69583df96b59
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue13916.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue13916 : IssuesUITest
+	{
+		public Issue13916(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] iOS Application crashes on Back press when navigated to using GoToAsync with \"//\" or \"///\" route if 2 or more things are removed from the navigation stack";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void RemovingMoreThanOneInnerPageAndThenPushingAPageCrashes()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("ClickMe1");
+			RunningApp.Tap("ClickMe2");
+			RunningApp.Tap("ClickMe3");
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1426.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1426.cs
new file mode 100644
index 000000000000..3ea2f98a32e4
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1426.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1426 : IssuesUITest
+	{
+		public Issue1426(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "SetHasNavigationBar screen height wrong";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		public void Github1426Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("You can see the coffe mug");
+			RunningApp.WaitForElement("CoffeeImageId");
+			RunningApp.WaitForElement("NextButtonID");
+			RunningApp.Tap("NextButtonID");
+			RunningApp.WaitForElement("PopButtonId");
+			RunningApp.Tap("PopButtonId");
+			RunningApp.WaitForElement("CoffeeImageId");
+			RunningApp.Screenshot("Coffe mug Image is still there on the bottom");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1436.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1436.cs
new file mode 100644
index 000000000000..581d85cd3dd9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1436.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1436 : IssuesUITest
+	{
+		public Issue1436(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Button border not drawn on Android without a BorderRadius"; 
+		
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnIOS]
+		public void Issue1436Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("I am at Issue 1436");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1469.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1469.cs
new file mode 100644
index 000000000000..09bff8a6bc50
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1469.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1469 : IssuesUITest
+	{
+		const string Go = "Select 3rd item";
+		const string Success = "Success";
+
+		public Issue1469(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Setting SelectedItem to null inside ItemSelected event handler does not work";
+
+		[Test]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue1469Test()
+		{
+			RunningApp.WaitForElement(Go);
+			RunningApp.Tap(Go);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1538.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1538.cs
new file mode 100644
index 000000000000..62234ae06e1a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1538.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1538 : IssuesUITest
+	{
+		public Issue1538(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Crash measuring empty ScrollView"; 
+		
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnIOS]
+		public void MeasuringEmptyScrollViewDoesNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			Task.Delay(1000).Wait();
+			RunningApp.WaitForElement("Foo");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583.cs
new file mode 100644
index 000000000000..d374799f1eff
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1583 : IssuesUITest
+	{
+		public Issue1583(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NavigationPage.TitleIcon broken"; 
+		
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue1583TitleIconTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("lblHello");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583_1.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583_1.cs
new file mode 100644
index 000000000000..9fcb75829971
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1583_1.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1583_1 : IssuesUITest
+	{
+		public Issue1583_1(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "WebView fails to load from urlwebviewsource with non-ascii characters (works with Uri)";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnIOS]
+		public async Task Issue1583_1_WebviewTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("label", "Could not find label", TimeSpan.FromSeconds(10), null, null);
+			await Task.Delay(TimeSpan.FromSeconds(3));
+			RunningApp.Screenshot("I didn't crash and i can see Skøyen");
+			RunningApp.Tap("hashButton");
+			await Task.Delay(TimeSpan.FromSeconds(3));
+			RunningApp.Screenshot("I didn't crash and i can see the GitHub comment #issuecomment-389443737");
+			RunningApp.Tap("queryButton");
+			await Task.Delay(TimeSpan.FromSeconds(3));
+			RunningApp.Screenshot("I didn't crash and i can see google search for http://microsoft.com");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1590.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1590.cs
new file mode 100644
index 000000000000..7f0a424154fe
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1590.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1590 : IssuesUITest
+	{
+		public Issue1590(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView.IsGroupingEnabled results ins ArguementOutOfRangeException"; 
+		
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void ListViewIsGroupingEnabledDoesNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("First");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1601.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1601.cs
new file mode 100644
index 000000000000..42a28b7bcca5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1601.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1601 : IssuesUITest
+	{
+		public Issue1601(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Exception thrown when `Removing Content Using LayoutCompression"; 
+		
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void Issue1601Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("Start G1601");
+			RunningApp.WaitForElement("CrashButton");
+			RunningApp.Screenshot("I see the button");
+			RunningApp.Tap("CrashButton");
+			RunningApp.Screenshot("Didn't crash!");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1667.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1667.cs
new file mode 100644
index 000000000000..67404602355f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1667.cs
@@ -0,0 +1,57 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1667 : IssuesUITest
+	{
+		public Issue1667(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Entry: Position and color of caret";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnIOS]
+		public void TestCursorPositionAndSelection()
+		{
+			RunningApp.WaitForElement("CursorTextEntry");
+
+			RunningApp.ClearText("CursorStart");
+			RunningApp.EnterText("CursorStart", "2");
+			RunningApp.ClearText("SelectionLength");
+			RunningApp.EnterText("SelectionLength", "3");
+			RunningApp.DismissKeyboard();
+			RunningApp.Tap("Update");
+			RunningApp.Screenshot("Text selection from char 2 length 3.");
+
+			RunningApp.Tap("CursorTextEntry");
+			var result = RunningApp.WaitForElement("SelectionLength").GetText();
+			ClassicAssert.AreEqual("0", result);
+		}
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnIOS]
+		public void TestCursorColorOniOS()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("CursorTextEntry");
+			RunningApp.Tap("Red");
+			RunningApp.Tap("CursorTextEntry");
+			RunningApp.Screenshot("Cursor is red.");
+
+			RunningApp.Tap("Blue");
+			RunningApp.Tap("CursorTextEntry");
+			RunningApp.Screenshot("Cursor is blue.");
+
+			RunningApp.Tap("Default");
+			RunningApp.Tap("CursorTextEntry");
+			RunningApp.Screenshot("Cursor is default color.");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1683.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1683.cs
new file mode 100644
index 000000000000..1a2bee39df83
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1683.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1683 : IssuesUITest
+	{
+		public Issue1683(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Auto Capitalization Implementation";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue1683Test()
+		{
+			RunningApp.WaitForElement("Rotation");
+
+			for (int i = 0; i < 6; i++)
+			{
+				RunningApp.Tap("Rotation");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1685.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1685.cs
new file mode 100644
index 000000000000..6b3233268841
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1685.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1685 : IssuesUITest
+	{
+		const string ButtonId = "Button1685";
+		const string Success = "Success";
+
+		public Issue1685(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Entry clears when upadting text from native with one-way binding"; 
+		
+		[Test]
+		[Category(UITestCategories.Entry)]
+		public void EntryOneWayBindingShouldUpdate()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(ButtonId);
+			RunningApp.Tap(ButtonId);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1700.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1700.cs
new file mode 100644
index 000000000000..ce0eab45e049
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1700.cs
@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1700 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue1700(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Image fails loading from long URL";
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			RunningApp.Back();
+		}
+
+		[Test]
+		[Category(UITestCategories.Image)]
+		[FailsOnIOS]
+		public void LongImageURLsShouldNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			// Give the images some time to load (or fail)
+			Task.Delay(3000).Wait();
+
+			// If we can see this label at all, it means we didn't crash and the test is successful
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1733.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1733.cs
new file mode 100644
index 000000000000..2594928c667c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1733.cs
@@ -0,0 +1,129 @@
+#nullable disable
+using System.Drawing;
+using System.Globalization;
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1733 : IssuesUITest
+	{
+		public Issue1733(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Autoresizable Editor";
+
+		/*	
+		Dictionary<string, Size> _results;
+
+		const string EditorHeightShrinkWithPressureId = "editorHeightShrinkWithPressureId";
+		const string EditorHeightGrowId = "editorHeightGrowId";
+		const string EditorWidthGrow1Id = "editorWidthGrow1Id";
+		const string EditorWidthGrow2Id = "editorWidthGrow2Id";
+		const string BtnChangeFontToDefault = "Change the Font to Default";
+		const string BtnChangeFontToLarger = "Change the Font to Larger";
+		const string BtnChangeToHasText = "Change to Has Text";
+		const string BtnChangeToNoText = "Change to Has No Text";
+		const string BtnChangeSizeOption = "Change the Size Option";
+
+		[Test]
+		[Category(UITestCategories.Editor)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void EditorAutoResize()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			string[] editors = new string[] { EditorHeightShrinkWithPressureId, EditorHeightGrowId, EditorWidthGrow1Id, EditorWidthGrow2Id };
+			RunningApp.WaitForElement(EditorHeightShrinkWithPressureId);
+
+			_results = new Dictionary<string, Size>();
+
+			foreach (var editor in editors)
+			{
+				_results.Add(editor, GetDimensions(editor));
+			}
+
+			RunningApp.Tap(BtnChangeToHasText);
+			RunningApp.WaitForElement(BtnChangeToNoText);
+			TestGrowth(false);
+			RunningApp.Tap(BtnChangeFontToLarger);
+			RunningApp.WaitForElement(BtnChangeFontToDefault);
+			TestGrowth(true);
+
+			// Reset back to being empty and make sure everything sets back to original size
+			RunningApp.Tap(BtnChangeFontToDefault);
+			RunningApp.Tap(BtnChangeToNoText);
+			RunningApp.WaitForElement(BtnChangeToHasText);
+			RunningApp.WaitForElement(BtnChangeFontToLarger);
+
+			foreach (var editor in editors)
+			{
+				var allTheSame = GetDimensions(editor);
+				ClassicAssert.AreEqual(allTheSame.Width, _results[editor].Width, editor);
+				ClassicAssert.AreEqual(allTheSame.Height, _results[editor].Height, editor);
+			}
+
+			// This sets it back to not auto size and we click everything again to see if it grows
+			RunningApp.Tap(BtnChangeSizeOption);
+			RunningApp.Tap(BtnChangeFontToLarger);
+			RunningApp.Tap(BtnChangeToHasText);
+			RunningApp.WaitForElement(BtnChangeFontToDefault);
+			RunningApp.WaitForElement(BtnChangeToNoText);
+			foreach (var editor in editors)
+			{
+				var allTheSame = GetDimensions(editor);
+				ClassicAssert.AreEqual(allTheSame.Width, _results[editor].Width, editor);
+				ClassicAssert.AreEqual(allTheSame.Height, _results[editor].Height, editor);
+			}
+		}
+
+		void TestGrowth(bool heightPressureShrink)
+		{
+			var testSizes = GetDimensions(EditorHeightShrinkWithPressureId);
+			ClassicAssert.AreEqual(testSizes.Width, _results[EditorHeightShrinkWithPressureId].Width, EditorHeightShrinkWithPressureId);
+
+			if (heightPressureShrink)
+				ClassicAssert.Less(testSizes.Height, _results[EditorHeightShrinkWithPressureId].Height, EditorHeightShrinkWithPressureId);
+			else
+				ClassicAssert.Greater(testSizes.Height, _results[EditorHeightShrinkWithPressureId].Height, EditorHeightShrinkWithPressureId);
+
+			testSizes = GetDimensions(EditorHeightGrowId);
+			ClassicAssert.AreEqual(testSizes.Width, _results[EditorHeightGrowId].Width, EditorHeightGrowId);
+			ClassicAssert.Greater(testSizes.Height, _results[EditorHeightGrowId].Height, EditorHeightGrowId);
+
+			var grow1 = GetDimensions(EditorWidthGrow1Id);
+			ClassicAssert.Greater(grow1.Width, _results[EditorWidthGrow1Id].Width, EditorWidthGrow1Id);
+			ClassicAssert.Greater(grow1.Height, _results[EditorWidthGrow1Id].Height, EditorWidthGrow1Id);
+
+			var grow2 = GetDimensions(EditorWidthGrow2Id);
+			ClassicAssert.Greater(grow2.Width, _results[EditorWidthGrow2Id].Width, EditorWidthGrow2Id);
+			ClassicAssert.Greater(grow2.Height, _results[EditorWidthGrow2Id].Height, EditorWidthGrow2Id);
+
+			// Grow 1 has a lower minimum width request so it's width should be smaller than grow 2
+			ClassicAssert.Greater(grow2.Width, grow1.Width, "grow2.Width > grow1.Width");
+		}
+
+		Size GetDimensions(string editorName)
+		{
+			RunningApp.WaitForElement($"{editorName}_height");
+			RunningApp.WaitForElement($"{editorName}_width");
+
+			var height = RunningApp.WaitForElement($"{editorName}_height").GetText();
+			var width = RunningApp.WaitForElement($"{editorName}_width").GetText();
+
+			if (height == null)
+			{
+				throw new ArgumentException($"{editorName}_height not found");
+			}
+			if (width == null)
+			{
+				throw new ArgumentException($"{editorName}_width not found");
+			}
+			return new Size(Convert.ToInt32(width, CultureInfo.InvariantCulture), Convert.ToInt32(height, CultureInfo.InvariantCulture));
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1747.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1747.cs
new file mode 100644
index 000000000000..7ea7cc937fad
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1747.cs
@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1747 : IssuesUITest
+	{
+		const string ToggleButtonAutomationId = nameof(ToggleButtonAutomationId);
+		const string ToggleSwitchAutomationId = nameof(ToggleSwitchAutomationId);
+
+		public Issue1747(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Binding to Switch.IsEnabled has no effect";
+
+		[Test]
+		[Category(UITestCategories.Switch)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue1747Test()
+		{
+			RunningApp.WaitForElement(ToggleButtonAutomationId);
+			RunningApp.WaitForElement(ToggleSwitchAutomationId);
+
+			var toggleSwitch = RunningApp.FindElement(ToggleSwitchAutomationId);
+			ClassicAssert.AreNotEqual(toggleSwitch, null);
+
+			RunningApp.Tap(ToggleButtonAutomationId);
+
+			toggleSwitch = RunningApp.FindElement(ToggleSwitchAutomationId);
+			ClassicAssert.AreNotEqual(toggleSwitch, null);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1769.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1769.cs
new file mode 100644
index 000000000000..c1af41d76203
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1769.cs
@@ -0,0 +1,36 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1769 : IssuesUITest
+	{
+		const string GoToPageTwoButtonText = "Go To Page 2";
+		const string SwitchAutomatedId = nameof(SwitchAutomatedId);
+		const string SwitchIsNowLabelTextFormat = "Switch is now {0}";
+
+		public Issue1769(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "PushAsync with Switch produces NRE";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Switch)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue1769Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(GoToPageTwoButtonText);
+			RunningApp.Tap(GoToPageTwoButtonText);
+
+			RunningApp.WaitForElement(SwitchAutomatedId);
+			RunningApp.WaitForElement(string.Format(SwitchIsNowLabelTextFormat, false));
+			RunningApp.Tap(SwitchAutomatedId);
+			RunningApp.WaitForElement(string.Format(SwitchIsNowLabelTextFormat, true));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1799.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1799.cs
new file mode 100644
index 000000000000..7bac442f84fa
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1799.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1799 : IssuesUITest
+	{
+		const string ListView = "ListView1799";
+		const string Success = "Success";
+
+		public Issue1799(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] listView without data crash on ipad.";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void ListViewWithoutDataDoesNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			var result = RunningApp.WaitForElement(ListView);
+			var listViewRect = result.GetRect();
+
+			RunningApp.DragCoordinates(listViewRect.CenterX(), listViewRect.Y, listViewRect.CenterX(), listViewRect.Y + 50);
+
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue181.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue181.cs
new file mode 100644
index 000000000000..5c072cf8537a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue181.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue181 : IssuesUITest
+	{
+		public Issue181(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Color not initialized for Label"; 
+		
+		[Test]
+		[Category(UITestCategories.Label)]
+		public void Issue181TestsLabelShouldHaveRedText()
+		{
+			RunningApp.WaitForElement("TestLabel");
+			RunningApp.Screenshot("Label should have red text");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1851.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1851.cs
new file mode 100644
index 000000000000..12f61a6b0849
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1851.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1851 : IssuesUITest
+	{
+		public Issue1851(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ObservableCollection in ListView gets Index out of range when removing item";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue1851Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("btn");
+			RunningApp.Tap("btn");
+			RunningApp.WaitForElement("btn");
+			RunningApp.Tap("btn");
+			RunningApp.WaitForElement("btn");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1900.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1900.cs
new file mode 100644
index 000000000000..63e64414fcce
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1900.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1900 : IssuesUITest
+	{
+		public Issue1900(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Xamarin ios ListView ObservableCollection<myClass>. Collection.Add() throwing 'Index # is greater than the number of rows #' exception";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue1900Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("ListView");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1905.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1905.cs
new file mode 100644
index 000000000000..439b26522c74
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1905.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1905 : IssuesUITest
+	{
+		public Issue1905(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "AlertView doesn't scroll when text is to large";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.DisplayAlert)]
+		[FailsOnAndroid]
+		public void TestIssue1905RefreshShows()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			// wait for test to load
+			RunningApp.WaitForElement("btnRefresh");
+			RunningApp.Screenshot("Should show refresh control");
+
+			// wait for test to finish so it doesn't keep working
+			// in the background and break the next test
+			RunningApp.WaitForElement("data refreshed");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1908.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1908.cs
new file mode 100644
index 000000000000..f633f75e6bea
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1908.cs
@@ -0,0 +1,25 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1908 : IssuesUITest
+	{
+		public Issue1908(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Image reuse"; 
+		
+		[Test]
+		[Category(UITestCategories.Image)]
+		public void Issue1908Test()
+		{
+			RunningApp.WaitForElement("OASIS1");
+			RunningApp.Screenshot("For manual review. Images load");
+		}
+	}
+}
+#endif
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1909.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1909.cs
new file mode 100644
index 000000000000..0482b37e12e9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1909.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue1909 : IssuesUITest
+	{
+		public Issue1909(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Xamarin.forms 2.5.0.280555 and android circle button issue";
+		
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnIOS]
+		public void Issue1909Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("I am at Issue 1909");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1931.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1931.cs
new file mode 100644
index 000000000000..8c16ba52ddb0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1931.cs
@@ -0,0 +1,34 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1931 : IssuesUITest
+	{
+		const string Go = "Go";
+		const string Back = "GoBack";
+		const string Success = "Success";
+
+		public Issue1931(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Xamarin Forms on Android: ScrollView on ListView header crashes app when closing page";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void ScrollViewInHeaderDisposesProperly()
+		{
+			RunningApp.WaitForElement(Go);
+			RunningApp.Tap(Go);
+
+			RunningApp.WaitForElement(Back);
+			RunningApp.Tap(Back);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1937.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1937.cs
new file mode 100644
index 000000000000..39f8c615554b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1937.cs
@@ -0,0 +1,37 @@
+#if WINDOWS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1937 : IssuesUITest
+	{
+		public Issue1937(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] Choppy animation";
+
+		[Test]
+		[Category(UITestCategories.Animation)]
+		public void Issue1937Test()
+		{
+			RunningApp.Tap("FAST_TIMER");
+			RunningApp.WaitForElement("COMPLETE", timeout: TimeSpan.FromSeconds(2));
+			var result = RunningApp.WaitForElement("RESULT");
+			int.TryParse(result.GetText(), out int timerTicks1);
+
+			//If fps > 50 then result must be 50. For small fps we use comparing with 35.
+			ClassicAssert.IsTrue(timerTicks1 > 35, $"Expected timer ticks are greater than 35. Actual: {timerTicks1}");
+
+			RunningApp.Tap("SLOW_TIMER");
+			RunningApp.WaitForElement("COMPLETE", timeout: TimeSpan.FromSeconds(2));
+			result = RunningApp.WaitForElement("RESULT");
+			int.TryParse(result.GetText(), out int timerTicks2);
+
+			ClassicAssert.IsTrue(timerTicks2 < 11, $"Expected timer ticks are less than 11. Actual: {timerTicks2}");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1942.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1942.cs
new file mode 100644
index 000000000000..9264896ad21d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1942.cs
@@ -0,0 +1,26 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1942 : IssuesUITest
+	{
+		const string ClickMeString = "CLICK ME";
+
+		public Issue1942(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Attached Touch Listener events do not dispatch to immediate parent Grid Renderer View on Android when Child fakes handled";
+
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnAndroid]
+		public void ClickPropagatesToOnTouchListener()
+		{
+			RunningApp.Tap(ClickMeString);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1975.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1975.cs
new file mode 100644
index 000000000000..abc48c98cbd0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue1975.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue1975 : IssuesUITest
+	{
+		const string Success = "If you can see this, the test has passed";
+		const string Go = "Go";
+
+		public Issue1975(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] ListView throws NRE when grouping enabled and data changed";
+		public override bool ResetMainPage => false;
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			RunningApp.Back();
+		}
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ClickPropagatesToOnTouchListener()
+		{
+			RunningApp.Tap(Go);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2004.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2004.cs
new file mode 100644
index 000000000000..0a88d4c4f777
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2004.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2004 : IssuesUITest
+	{
+		public Issue2004(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Xamarin caused by: android.runtime.JavaProxyThrowable: System.ObjectDisposedException: Cannot access a disposed object";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void NoCrashFromDisposedBitmapWhenSwitchingPages()
+		{
+			RunningApp.WaitForNoElement("Success", timeout: TimeSpan.FromSeconds(20));
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2035.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2035.cs
new file mode 100644
index 000000000000..7b593bbb0a0f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2035.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2035 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue2035(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "App crashes when setting CurrentPage on TabbedPage in ctor in 2.5.1pre1";
+		
+		[Test]
+		[Category(UITestCategories.TabbedPage)]
+		[FailsOnIOS]
+		public void Issue2035Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(Success);
+			//if it doesn't crash, we're good.
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2222.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2222.cs
new file mode 100644
index 000000000000..808da4ebc19c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2222.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2222 : IssuesUITest
+	{
+		public Issue2222(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NavigationBar.ToolbarItems.Add() crashes / breaks app in iOS7. works fine in iOS8";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void TestItDoesntCrashWithWrongIconName()
+		{
+			RunningApp.WaitForElement("TestLabel");
+			RunningApp.Screenshot("Was label on page shown");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2241.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2241.cs
new file mode 100644
index 000000000000..10167c9cc9d9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2241.cs
@@ -0,0 +1,32 @@
+#if IOS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2241 : IssuesUITest
+	{
+		public Issue2241(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ScrollView content can become stuck on orientation change (iOS)";
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void ChangeOrientationCheckScroll()
+		{
+			var grid1 = RunningApp.FindElement("MainGrid").GetRect();
+			RunningApp.SetOrientationLandscape();
+			App.ScrollDown("TestScrollView", ScrollStrategy.Programmatically);
+			RunningApp.SetOrientationPortrait();
+			var grid2 = RunningApp.FindElement("MainGrid").GetRect();
+			RunningApp.Screenshot("Did it resize ok? Do you see some white on the bottom?");
+
+			ClassicAssert.AreEqual(grid1.CenterY(), grid2.CenterY());
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2259.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2259.cs
new file mode 100644
index 000000000000..a88164bf5e10
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2259.cs
@@ -0,0 +1,30 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2259 : IssuesUITest
+	{
+		public Issue2259(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView.ScrollTo crashes app";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue2259Tests()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac]);
+
+			for (int i = 0; i < 20; i++)
+			{
+				RunningApp.Tap("AddButton");
+				RunningApp.WaitForElement("Name " + (i + 1).ToString());
+				RunningApp.Screenshot("Added Cell");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2339.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2339.cs
new file mode 100644
index 000000000000..1a364a7f6eab
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2339.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2339 : IssuesUITest
+	{
+		public Issue2339(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Picker not shown when .Focus() is called";
+
+		[Test]
+		[Category(UITestCategories.Picker)]
+		[FailsOnIOS]
+		public void FocusAndUnFocusMultipleTimes()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows], "Focus Behavior is different");
+
+			RunningApp.WaitForElement("btnFocusThenUnFocus");
+			RunningApp.Tap("btnFocusThenUnFocus");
+			RunningApp.WaitForNoElement("Picker Focused: 1");
+			RunningApp.WaitForNoElement("Picker UnFocused: 1");
+			RunningApp.Back();
+			RunningApp.Tap("btnFocusThenUnFocus");
+			RunningApp.WaitForNoElement("Picker Focused: 2");
+			RunningApp.WaitForNoElement("Picker UnFocused: 2");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2354.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2354.cs
new file mode 100644
index 000000000000..9dd6c2f93f31
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2354.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2354 : IssuesUITest
+	{
+		public Issue2354(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView, ImageCell and disabled source cache and same image url";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		public void TestDoesntCrashWithCachingDisable()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("ImageLoaded");
+			App.ScrollDown("TestListView", ScrollStrategy.Programmatically);
+			App.ScrollDown("TestListView", ScrollStrategy.Programmatically);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2399.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2399.cs
new file mode 100644
index 000000000000..8c8e72b764c2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2399.cs
@@ -0,0 +1,32 @@
+#if IOS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2399 : IssuesUITest
+	{
+		const string AllEventsHaveDetached = "AllEventsHaveDetached";
+
+		public Issue2399(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Label Renderer Dispose never called";
+
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void WaitForAllEffectsToDetach()
+		{
+			RunningApp.WaitForElement(AllEventsHaveDetached);
+			var text = RunningApp.FindElement(AllEventsHaveDetached).GetText();
+			ClassicAssert.NotNull(text);
+			ClassicAssert.AreEqual("Success", text);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue24574.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue24574.cs
new file mode 100644
index 000000000000..48450b342338
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue24574.cs
@@ -0,0 +1,30 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue24574 : IssuesUITest
+	{
+		public Issue24574(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Tap Double Tap";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		public void TapThenDoubleTap()
+		{
+			RunningApp.Screenshot("I am at Issue 24574");
+
+			RunningApp.WaitForElement("TapLabel");
+
+			RunningApp.Tap("TapLabel");
+			RunningApp.WaitForNoElement("Single");
+
+			RunningApp.DoubleClick("TapLabel");
+			RunningApp.WaitForNoElement("Double");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2482.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2482.cs
new file mode 100644
index 000000000000..01c70836db8c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2482.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2482 : IssuesUITest
+	{
+		const string ButtonId = "SpinButton";
+		const string Success = "Success";
+
+		public Issue2482(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Animating a `View` that is currently animating will throw `System.InvalidOperationException`";
+
+		[Test]
+		[Category(UITestCategories.Animation)]
+		public void AnimationCancel()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(ButtonId);
+			App.DoubleClick(ButtonId);
+			RunningApp.WaitForNoElement(Success, timeout: TimeSpan.FromSeconds(25));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2617.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2617.cs
new file mode 100644
index 000000000000..39f8694d7f57
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2617.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2617 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue2617(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Error on binding ListView with duplicated items";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public async Task BindingToValuesTypesAndScrollingNoCrash()
+		{
+			await Task.Delay(4000);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2653.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2653.cs
new file mode 100644
index 000000000000..20c24d2fcde8
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2653.cs
@@ -0,0 +1,31 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests 
+{
+	public class Issue2653 : IssuesUITest
+	{
+		const string ButtonText = "Insert Box View";
+		const string TestForButtonClicked = "Test For Clicked";
+		const string Success = "BoxView Not Overlapping";
+
+		public Issue2653(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] Grid insert z-order on UWP broken in Forms 3";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ZIndexWhenInsertingChildren()
+		{
+			RunningApp.WaitForNoElement(ButtonText);
+			RunningApp.Tap(ButtonText);
+			RunningApp.Tap(ButtonText);
+			RunningApp.Tap(TestForButtonClicked);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2674.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2674.cs
new file mode 100644
index 000000000000..3d9d0cd6678b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2674.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2674 : IssuesUITest
+	{
+		public Issue2674(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Exception occurs when giving null values in picker itemsource collection"; 
+		
+		[Test]
+		[Category(UITestCategories.Picker)]
+		[FailsOnIOS]
+		public void Issue2674Test()
+		{
+			RunningApp.Screenshot("I am at Issue2674");
+			RunningApp.WaitForElement("picker");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2680ScrollView.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2680ScrollView.cs
new file mode 100644
index 000000000000..f49cb16a9c60
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2680ScrollView.cs
@@ -0,0 +1,43 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2680ScrollView : IssuesUITest
+	{
+		const string ScrollViewMark = "ScrollView";
+		const string FirstItemMark = "FirstItem";
+		const string ToggleButtonMark = "ToggleButton";
+
+		public Issue2680ScrollView(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Enhancement] Add VerticalScrollMode/HorizontalScrollMode to ListView and ScrollView";
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue2680Test_ScrollDisabled()
+		{
+			App.ScrollDown(ScrollViewMark);
+			App.ScrollDown(ScrollViewMark);
+
+			RunningApp.WaitForElement(FirstItemMark, timeout: TimeSpan.FromSeconds(5));
+		}
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnIOS]
+		public void Issue2680Test_ScrollEnabled()
+		{
+			RunningApp.Tap(ToggleButtonMark);
+
+			App.ScrollDown(ScrollViewMark);
+			App.ScrollDown(ScrollViewMark);
+
+			RunningApp.WaitForNoElement(FirstItemMark, timeout: TimeSpan.FromSeconds(5));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2681.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2681.cs
new file mode 100644
index 000000000000..7f23f1580f01
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2681.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+    public class Issue2681 : IssuesUITest
+	{
+		const string NavigateToPage = "Click Me.";
+
+		public Issue2681(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] Label inside Listview gets stuck inside infinite loop";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		public void ListViewDoesntFreezeApp()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.Tap(NavigateToPage);
+			RunningApp.WaitForNoElement("3");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2728.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2728.cs
new file mode 100644
index 000000000000..04eed56764c2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2728.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests 
+{
+	public class Issue2728 : IssuesUITest
+	{
+		const string LabelHome = "Hello Label";
+
+		public Issue2728(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[macOS] Label FontAttributes Italic is not working";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void Issue2728TestsItalicLabel()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement(LabelHome);
+			RunningApp.Screenshot("Label rendered with italic font");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2775.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2775.cs
new file mode 100644
index 000000000000..778aaa59e8f4
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2775.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2775 : IssuesUITest
+	{
+		public Issue2775(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ViewCell background conflicts with ListView Semi-Transparent and Transparent backgrounds";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue2775Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("I am at Issue 2775");
+			RunningApp.Screenshot("I see the Label");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2777.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2777.cs
new file mode 100644
index 000000000000..63d718a164fe
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2777.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2777 : IssuesUITest
+	{
+		public Issue2777(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "When add GroupHeaderTemplate in XAML the group header does not show up";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void Issue2777Test()
+		{
+			RunningApp.Screenshot("I am at Issue 2965");
+			RunningApp.WaitForNoElement("The letter A");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2829.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2829.cs
new file mode 100644
index 000000000000..96805997032e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2829.cs
@@ -0,0 +1,34 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2829 : IssuesUITest
+	{
+		const string kScrollMe = "kScrollMe";
+		const string kSuccess = "SUCCESS";
+		const string kCreateListViewButton = "kCreateListViewButton";
+
+		public Issue2829(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Renderers associated with ListView cells are occasionaly not being disposed of which causes left over events to propagate to disposed views";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		public void ViewCellsAllDisposed()
+		{
+			RunningApp.Tap(kCreateListViewButton);
+			RunningApp.WaitForNoElement("0");
+			RunningApp.Tap(kScrollMe);
+			RunningApp.WaitForNoElement("70");
+			RunningApp.Back();
+			RunningApp.WaitForElement(kSuccess);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2837.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2837.cs
new file mode 100644
index 000000000000..6e737708342a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2837.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2837 : IssuesUITest
+	{
+		const string Success = "worked";
+
+		public Issue2837(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Exception thrown during NavigationPage.Navigation.PopAsync";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void Issue2837Test()
+		{
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2842.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2842.cs
new file mode 100644
index 000000000000..191fab58ea15
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2842.cs
@@ -0,0 +1,27 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2842 : IssuesUITest
+	{
+		public Issue2842(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ViewCell in TableView not adapting to changed size on iOS";
+
+		[Test]
+		[Category(UITestCategories.TabbedPage)]
+		[FailsOnIOS]
+		public void Issue2842Test()
+		{
+			RunningApp.WaitForElement("btnClick");
+			RunningApp.Tap("btnClick");
+			RunningApp.Screenshot("Verify that the text is not on top of the image");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2858.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2858.cs
new file mode 100644
index 000000000000..81d57496f6cd
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2858.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2858 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string InnerGrid = "InnerGrid";
+		const string OuterGrid = "OuterGrid";
+
+		public Issue2858(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Transparency Cascading";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void CascadeInputTransparentGrids()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(InnerGrid);
+			RunningApp.Tap(InnerGrid);
+
+			var green = RunningApp.WaitForElement(OuterGrid).GetRect();
+			App.TapCoordinates(green.CenterX(), green.Y + 20);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2929.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2929.cs
new file mode 100644
index 000000000000..82f3f6f06a81
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2929.cs
@@ -0,0 +1,42 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2929 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string Go = "Go";
+
+		public Issue2929(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] ListView with null ItemsSource crashes on 3.0.0.530893";
+	
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void NullItemSourceDoesNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac]);
+
+			// If we can see the Success label, it means we didn't crash. 
+			RunningApp.WaitForElement(Success);
+		}
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void SettingItemsSourceToNullDoesNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac]);
+			
+			RunningApp.WaitForElement(Go);
+			RunningApp.Tap(Go);
+
+			// If we can see the Success label, it means we didn't crash. 
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2963.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2963.cs
new file mode 100644
index 000000000000..e3b8ff31e7be
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2963.cs
@@ -0,0 +1,30 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue2963 : IssuesUITest
+	{
+		readonly string EditorId = "DisabledEditor";
+		readonly string FocusedLabelId = "FocusedLabel";
+
+		public Issue2963(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Disabling Editor in iOS does not disable entry of text";
+
+		[Test]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue2963Test()
+		{
+			RunningApp.Screenshot("I am at Issue 2963");
+			RunningApp.Tap(EditorId);
+			ClassicAssert.AreEqual("False", RunningApp.FindElement(FocusedLabelId).GetText());
+			RunningApp.Screenshot("Label should still be false");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2983.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2983.cs
new file mode 100644
index 000000000000..7cd8dfdd8ac5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue2983.cs
@@ -0,0 +1,22 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue2983 : IssuesUITest
+	{
+		public Issue2983(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView.Footer can cause NullReferenceException";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void TestDoesNotCrash()
+		{
+			RunningApp.WaitForElement("footer");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3000.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3000.cs
new file mode 100644
index 000000000000..cf0325f1a684
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3000.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3000 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue3000(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Horizontal ScrollView breaks scrolling when flowdirection is set to rtl";
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void RtlScrollViewStartsScrollToRight()
+		{
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3001.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3001.cs
new file mode 100644
index 000000000000..11c94c9a03fd
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3001.cs
@@ -0,0 +1,28 @@
+#if MACCATALYST
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3001 : IssuesUITest
+	{
+		const string ButtonId = "ClearButton";
+		const string ReadyId = "ReadyLabel";
+
+		public Issue3001(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[macOS] Navigating back from a complex page is highly inefficient";
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void Issue3001Test()
+		{
+			RunningApp.WaitForElement(ButtonId);
+			RunningApp.Tap(ButtonId);
+			RunningApp.WaitForElement(ReadyId, timeout: TimeSpan.FromSeconds(5));
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3049.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3049.cs
new file mode 100644
index 000000000000..27f29aed88b0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3049.cs
@@ -0,0 +1,43 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3049 : IssuesUITest
+	{
+		const string Button1Id = "button1";
+		const string Button2Id = "button2";
+		const string LabelId = "label";
+		const string Success = "Success";
+		const string Action1 = "Don't click me";
+
+		public Issue3049(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "DisplayActionSheet freezes app in iOS custom renderer (iPad only)";
+
+		[Test]
+		[Category(UITestCategories.DisplayAlert)]
+		[FailsOnIOS]
+		public async Task Issue3049Test()
+		{
+			RunningApp.WaitForElement(Button1Id);
+
+			RunningApp.Tap(Button1Id);
+
+			await Task.Delay(500);
+			//RunningApp.WaitForElement(Action1);
+
+			// Tap outside ActionSheet to dismiss it
+			RunningApp.Tap(LabelId);
+
+			RunningApp.WaitForElement(Button2Id);
+			RunningApp.Tap(Button2Id);
+
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3087.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3087.cs
new file mode 100644
index 000000000000..5f475324ae3f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3087.cs
@@ -0,0 +1,23 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+    public class Issue3087 : IssuesUITest
+	{
+		public Issue3087(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Non appcompat SwitchRenderer regression between 3.0 and 3.1";
+
+		[Test]
+		[Category(UITestCategories.Switch)]
+		public void NonAppCompatBasicSwitchTest()
+		{
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3089.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3089.cs
new file mode 100644
index 000000000000..17a795db4db0
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3089.cs
@@ -0,0 +1,30 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3089 : IssuesUITest
+	{
+		const string Reload = "reload";
+		const string Success = "success";
+
+		public Issue3089(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "TextCell text doesn't change when using Recycling on ListViews";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ResettingItemsOnRecycledListViewKeepsOldText()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap(Reload);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3262.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3262.cs
new file mode 100644
index 000000000000..5620c3ebfbb4
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3262.cs
@@ -0,0 +1,103 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3262 : IssuesUITest
+	{
+		public Issue3262(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Adding Cookies ability to a WebView...";
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		public void LoadingPageWithoutCookiesSpecifiedDoesntCrash()
+		{
+			RunningApp.Tap("PageWithoutCookies");
+			RunningApp.WaitForElement("PageWithoutCookies");
+		}
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ChangeDuringNavigating()
+		{
+			RunningApp.WaitForElement("Loaded");
+			// add a couple cookies
+			RunningApp.Tap("ChangeDuringNavigating");
+			ValidateSuccess();
+			RunningApp.Tap("ChangeDuringNavigating");
+			ValidateSuccess();
+		}
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void AddAdditionalCookieToWebView()
+		{
+			RunningApp.WaitForElement("Loaded");
+			// add a couple cookies
+			RunningApp.Tap("AdditionalCookie");
+			ValidateSuccess();
+			RunningApp.Tap("AdditionalCookie");
+			ValidateSuccess();
+		}
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void SetToOneCookie()
+		{
+			RunningApp.WaitForElement("Loaded");
+			RunningApp.Tap("OneCookie");
+			ValidateSuccess();
+		}
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void SetCookieContainerToNullDisablesCookieManagement()
+		{
+			RunningApp.WaitForElement("Loaded");
+			// add a cookie to verify said cookie remains
+			RunningApp.Tap("AdditionalCookie");
+			ValidateSuccess();
+			RunningApp.Tap("NullAllCookies");
+			ValidateSuccess();
+		}
+
+		[Test]
+		[Category(UITestCategories.WebView)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void RemoveAllTheCookiesIAdded()
+		{
+			RunningApp.WaitForElement("Loaded");
+			// add a cookie so you can remove a cookie
+			RunningApp.Tap("AdditionalCookie");
+			ValidateSuccess();
+			RunningApp.Tap("EmptyAllCookies");
+			ValidateSuccess();
+		}
+
+		void ValidateSuccess()
+		{
+			try
+			{
+				RunningApp.WaitForElement("Success");
+			}
+			catch
+			{
+				RunningApp.Tap("DisplayAllCookies");
+				throw;
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3273.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3273.cs
new file mode 100644
index 000000000000..de1c95afeff6
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3273.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3273 : IssuesUITest
+	{
+		public Issue3273(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Drag and drop reordering not firing CollectionChanged";
+
+		[Test]
+		[Category(UITestCategories.Gestures)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue3273Test()
+		{
+			RunningApp.WaitForElement("Move items");
+			RunningApp.Tap("Move items");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3275.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3275.cs
new file mode 100644
index 000000000000..cf5aebd03189
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3275.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3275 : IssuesUITest
+	{
+		readonly string BtnLeakId = "btnLeak";
+		readonly string BtnScrollToId = "btnScrollTo";
+
+		public Issue3275(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "For ListView in Recycle mode ScrollTo causes cell leak and in some cases NRE";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue3275Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(BtnLeakId);
+			RunningApp.Tap(BtnLeakId);
+			RunningApp.WaitForElement(BtnScrollToId);
+			RunningApp.Tap(BtnScrollToId);
+			RunningApp.Back();
+			RunningApp.WaitForElement(BtnLeakId);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3333.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3333.cs
new file mode 100644
index 000000000000..05e0b72361ef
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3333.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{ 
+    public class Issue3333 : IssuesUITest
+	{
+		const string KSuccess = "If you're reading this the test has passed";
+
+		public Issue3333(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] with ListView on page, Navigation.PopAsync() throws exception";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void SettingBindingContextToNullBeforingPoppingPageCrashes()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement(KSuccess);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3342.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3342.cs
new file mode 100644
index 000000000000..818613bebe64
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3342.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue3342 : IssuesUITest
+	{
+		public Issue3342(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] BoxView BackgroundColor not working on 3.2.0-pre1";
+		
+		[Test]
+		[Category(UITestCategories.BoxView)]
+		public void Issue3342Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Screenshot("I am at Issue 3342");
+			RunningApp.Screenshot("I see the green box");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3385.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3385.cs
new file mode 100644
index 000000000000..ace4a35ced87
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3385.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3385 : IssuesUITest
+	{
+		public Issue3385(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Entry's TextChanged event is fired on Unfocus even when no text changed";
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		[FailsOnIOS]
+		public void Issue3385Test()
+		{
+			RunningApp.WaitForElement("entry");
+			RunningApp.Tap("entry");
+			RunningApp.WaitForElement("click");
+			RunningApp.Tap("click");
+			RunningApp.WaitForNoElement("FAIL");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3390.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3390.cs
new file mode 100644
index 000000000000..50b5867ec1fb
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3390.cs
@@ -0,0 +1,24 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue3390 : IssuesUITest
+	{
+		public Issue3390(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Crash/incorrect behavior with corner radius 5";
+
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnIOS]
+		public void Issue3390Test()
+		{
+			RunningApp.Tap("TestButton");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3413.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3413.cs
new file mode 100644
index 000000000000..f38e39ab9453
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3413.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue3413 : IssuesUITest
+	{
+		public Issue3413(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Searchbar in Horizontal Stacklayout doesn't render";
+
+		[Test]
+		[Category(UITestCategories.SearchBar)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue3413Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("srb_vertical");
+			RunningApp.WaitForElement("srb_horizontal");
+			RunningApp.Screenshot("Please verify we have 2 SearchBars. One below the label, other side by side with the label");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue342.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue342.cs
new file mode 100644
index 000000000000..b799a0ba49ba
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue342.cs
@@ -0,0 +1,47 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue342NoSource : IssuesUITest
+	{
+		public Issue342NoSource(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NRE when Image is not assigned source";
+
+		[Test]
+		[Category(UITestCategories.Page)]
+		[FailsOnIOS]
+		public void Issue342NoSourceTestsLablePresentNoImage()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForNoElement("Uninitialized image", "Cannot see label");
+			RunningApp.Screenshot("All elements present");
+		}
+	}
+
+
+	public class Issue342DelayedSource : IssuesUITest
+	{
+		public Issue342DelayedSource(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NRE when Image is delayed source";
+
+		[Test]
+		[Category(UITestCategories.Page)]
+		[FailsOnIOS]
+		public void Issue342DelayedLoadTestsImageLoads()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("Should not crash");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3507.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3507.cs
new file mode 100644
index 000000000000..bbc7f51c322f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3507.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3507 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue3507(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] Scrollview with null content crashes on UWP";
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnIOS]
+		public void NullContentOnScrollViewDoesntCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForNoElement(Success);
+			//if it doesn't crash, we're good.
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3548.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3548.cs
new file mode 100644
index 000000000000..1bccfccce083
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3548.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3548 : IssuesUITest
+	{
+		const string SuccessMessage = "EFFECT IS ATTACHED!";
+
+		public Issue3548(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Cannot attach effect to Frame";
+
+		[Test]
+		[Category(UITestCategories.Frame)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void CheckIsEffectAttached()
+		{
+			RunningApp.WaitForNoElement(SuccessMessage);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3667.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3667.cs
new file mode 100644
index 000000000000..028bfd9687ee
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3667.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue3667 : IssuesUITest
+	{
+		string text = "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.";
+
+		public Issue3667(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Enhancement] Add text-transforms to Label";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnIOS]
+		public void Issue3667Tests()
+		{
+			RunningApp.WaitForNoElement(text);
+			RunningApp.Tap("ChangeTextTransformButton");
+			RunningApp.WaitForNoElement(text);
+			RunningApp.Tap("ChangeTextTransformButton");
+			RunningApp.WaitForNoElement(text.ToLowerInvariant());
+			RunningApp.Tap("ChangeTextTransformButton");
+			RunningApp.WaitForNoElement(text.ToUpperInvariant());
+			RunningApp.Tap("ChangeTextTransformButton");
+			RunningApp.WaitForNoElement(text);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3884.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3884.cs
new file mode 100644
index 000000000000..0a6081b1f003
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue3884.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue3884 : IssuesUITest
+	{
+		public Issue3884(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "BoxView corner radius";
+		
+		[Test]
+		[Category(UITestCategories.BoxView)]
+		[FailsOnIOS]
+		public void Issue3884Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("I see a blue circle");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue417.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue417.cs
new file mode 100644
index 000000000000..51b3662db59e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue417.cs
@@ -0,0 +1,43 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue417 : IssuesUITest
+	{
+		public Issue417(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Navigation.PopToRootAsync does nothing";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		public void Issue417TestsNavigateAndPopToRoot()
+		{
+			RunningApp.WaitForElement("FirstPage");
+			RunningApp.WaitForElement("NextPage");
+			RunningApp.Screenshot("All elements present");
+
+			RunningApp.Tap("NextPage");
+
+			RunningApp.WaitForElement("SecondPage");
+			RunningApp.WaitForElement("NextPage2");
+			RunningApp.Screenshot("At second page");
+			RunningApp.Tap("NextPage2");
+
+			RunningApp.WaitForElement("ThirdPage");
+			RunningApp.WaitForElement("PopToRoot");
+			RunningApp.Screenshot("At third page");
+			RunningApp.Tap("PopToRoot");
+
+			RunningApp.WaitForElement("FirstPage");
+			RunningApp.WaitForElement("NextPage");
+			RunningApp.Screenshot("All elements present");
+
+			RunningApp.Screenshot("Popped to root");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4484.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4484.cs
new file mode 100644
index 000000000000..4b707d108479
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4484.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue4484 : IssuesUITest
+	{
+		public Issue4484(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] ImageButton inside NavigationView.TitleView throw exception during device rotation";
+		public override bool ResetMainPage => false;
+
+		protected override void FixtureTeardown()
+		{
+			base.FixtureTeardown();
+			RunningApp.SetOrientationPortrait();
+		}
+
+		[Test]
+		[Category(UITestCategories.ImageButton)]
+		public void RotatingDeviceDoesntCrashTitleView()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("Instructions");
+			RunningApp.SetOrientationLandscape();
+			RunningApp.WaitForElement("Instructions");
+			RunningApp.SetOrientationPortrait();
+			RunningApp.WaitForElement("Instructions");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4600.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4600.cs
new file mode 100644
index 000000000000..6b5b877fe343
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4600.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue4600 : IssuesUITest
+	{
+		public Issue4600(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] CollectionView crash with empty ObservableCollection";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void InitiallyEmptySourceDisplaysAddedItem()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("Insert");
+			RunningApp.Tap("btnInsert");
+			RunningApp.WaitForNoElement("Inserted");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue465.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue465.cs
new file mode 100644
index 000000000000..a65debb20e0f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue465.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue465 : IssuesUITest
+	{
+		public Issue465(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Change in Navigation.PushModal";
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		public void Issue465TestsPushPopModal()
+		{
+			RunningApp.WaitForElement("PopPage");
+			RunningApp.Screenshot("All elements exist");
+
+			RunningApp.Tap("PopPage");
+			RunningApp.WaitForElement("Popppppped");
+			RunningApp.Screenshot("Popped modal successful");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4782.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4782.cs
new file mode 100644
index 000000000000..a8c951b18da9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4782.cs
@@ -0,0 +1,25 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue4782 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue4782(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Null drawable crashes Image Button";
+
+		[Test]
+		[Category(UITestCategories.ImageButton)]
+		public void ImageButtonNullDrawable()
+		{
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4879.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4879.cs
new file mode 100644
index 000000000000..dae7c21dd73f
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue4879.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue4879 : IssuesUITest
+	{
+		public Issue4879(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "4879 - ImageButtonPadding";
+
+		[Test]
+		[Category(UITestCategories.ImageButton)]
+		public void Issue4879Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("I am at Issue 4879. All buttons or images should be the same size.");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue488.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue488.cs
new file mode 100644
index 000000000000..2bb258a2d85b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue488.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue488 : IssuesUITest
+	{
+		public Issue488(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Resizing the Label results in wrapped text being cropped on iOS";
+
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnAllPlatforms]
+		public void Issue488TestsLongTextRotation()
+		{
+			RunningApp.WaitForNoElement("I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text.");
+			RunningApp.SetOrientationLandscape();
+			RunningApp.Screenshot("Resize Label.Text by rotating to landscape");
+			RunningApp.WaitForNoElement("I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text. I am a long bit of text.");
+			RunningApp.Screenshot("Entire Label.Text present");
+			RunningApp.SetOrientationPortrait();
+			RunningApp.Screenshot("Rotated back to portrait");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5239.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5239.cs
new file mode 100644
index 000000000000..775c21342e30
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5239.cs
@@ -0,0 +1,26 @@
+#if IOS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5239 : IssuesUITest
+	{
+		public Issue5239(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Top Padding not working on iOS when it is set alone";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void PaddingEqualToSafeAreaWorks()
+		{
+			var somePadding = RunningApp.WaitForElement("Hello").GetRect();
+			ClassicAssert.AreEqual(20f, somePadding.Y);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5367.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5367.cs
new file mode 100644
index 000000000000..ed3cbb3a5981
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5367.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5367 : IssuesUITest
+	{
+		const string MaxLengthEditor = "MaxLength Editor";
+		const string ForceBigStringButton = "Force Big String Button";
+
+		public Issue5367(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Editor with MaxLength";
+
+		[Test]
+		[Category(UITestCategories.Editor)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue3390Test()
+		{
+			RunningApp.WaitForElement(MaxLengthEditor);
+			RunningApp.Tap(ForceBigStringButton);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5376.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5376.cs
new file mode 100644
index 000000000000..3abc60e872ae
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5376.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5376 : IssuesUITest
+	{
+		public Issue5376(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Call unfocus entry crashes app";
+		
+		[Test]
+		[Category(UITestCategories.Entry)]
+		public void Issue5376Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5461.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5461.cs
new file mode 100644
index 000000000000..dea6f24b6a89
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5461.cs
@@ -0,0 +1,25 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5461 : IssuesUITest
+	{
+		const string Success = "If you can see this, the test has passed";
+
+		public Issue5461(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] ScrollView crashes when setting ScrollbarFadingEnabled to false in Custom Renderer";
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void ScrollViewWithScrollbarFadingEnabledFalseDoesntCrash()
+		{
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5535.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5535.cs
new file mode 100644
index 000000000000..3dc257bf0b68
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5535.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5535 : IssuesUITest
+	{
+		public Issue5535(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "CollectionView: Swapping EmptyViews has no effect";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void SwappingEmptyViews()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("FilterItems");
+			RunningApp.Tap("FilterItems");
+			RunningApp.EnterText("FilterItems", "abcdef");
+
+			// Default empty view
+			RunningApp.WaitForNoElement("Nothing to see here.");
+
+			RunningApp.Tap("ToggleEmptyView");
+
+			// Other empty view
+			RunningApp.WaitForNoElement("No results matched your filter.");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5555.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5555.cs
new file mode 100644
index 000000000000..d0d7db381d62
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5555.cs
@@ -0,0 +1,34 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5555 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue5555(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Memory leak when SwitchCell or EntryCell";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void BindingToValuesTypesAndScrollingNoCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+			RunningApp.Tap("PushPageButton");
+			RunningApp.WaitForElement("PushPageButton");
+			RunningApp.Tap("PushPageButton");
+			RunningApp.WaitForElement("PushPageButton");
+
+			RunningApp.WaitForNoElement("You can check result");
+			RunningApp.Tap("CheckResultButton");
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5765.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5765.cs
new file mode 100644
index 000000000000..b7f05aa7cdf7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5765.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5765 : IssuesUITest
+	{
+		const string Target = "FirstLabel";
+
+		public Issue5765(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Frame, CollectionView, Android]The Label.Text is invisible on Android if DataTemplate have frame as layout";
+	
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void FlexLayoutsInFramesShouldSizeCorrectly()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			// If the first label is visible at all, then this has succeeded
+			RunningApp.WaitForElement(Target);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5830.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5830.cs
new file mode 100644
index 000000000000..682eef1495c1
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5830.cs
@@ -0,0 +1,26 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue5830 : IssuesUITest
+	{
+		public Issue5830(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Enhancement] EntryCellTableViewCell should be public";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue5830Test()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("EntryTableViewCell Test with custom Text and TextColor");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5951.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5951.cs
new file mode 100644
index 000000000000..5d1e4fd32e3b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue5951.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue5951 : IssuesUITest
+	{
+		public Issue5951(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "App Crashes On Shadow Effect's OnDetached On Button That's Never Visible";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue5951Test()
+		{
+			RunningApp.Tap("Push page");
+			RunningApp.WaitForElement("Push page");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6260.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6260.cs
new file mode 100644
index 000000000000..e7bd93b702ac
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6260.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6260 : IssuesUITest
+	{
+		const string Text = "If this number keeps increasing test has failed: ";
+		readonly string success = Text + "0";
+
+		public Issue6260(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] infinite layout loop";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		public void NonAppCompatBasicSwitchTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6262.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6262.cs
new file mode 100644
index 000000000000..6c17aa41c2bc
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6262.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6262 : IssuesUITest
+	{
+		public Issue6262(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Button in Grid gets wrong z-index";
+
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ImageShouldLayoutOnTopOfButton()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("ClickMe");
+			RunningApp.Tap("ClickMe");
+			RunningApp.WaitForElement("ClickMe");
+			RunningApp.WaitForNoElement("Fail");
+			RunningApp.Tap("RetryTest");
+			RunningApp.WaitForElement("ClickMe");
+			RunningApp.Tap("ClickMe");
+			RunningApp.WaitForElement("ClickMe");
+			RunningApp.WaitForNoElement("Fail");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6368.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6368.cs
new file mode 100644
index 000000000000..d69e0596575b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6368.cs
@@ -0,0 +1,28 @@
+#if iOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6368 : IssuesUITest
+	{
+		public Issue6368(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[CustomRenderer]Crash when navigating back from page with custom renderer control";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnIOS]
+		public void Issue6368Test()
+		{
+			RunningApp.WaitForElement("btnGo");
+			RunningApp.Tap("btnGo");
+			RunningApp.WaitForElement("GoToNextPage");
+			RunningApp.Back();
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6458.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6458.cs
new file mode 100644
index 000000000000..2b3601d70130
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6458.cs
@@ -0,0 +1,32 @@
+#if ANDROID
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6458 : IssuesUITest
+	{
+		public Issue6458(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Fix load TitleIcon on non app compact";
+
+		[Test]
+		[Category(UITestCategories.Navigation)]
+		[FailsOnAndroid]
+		public void Issue6458Test()
+		{
+			RunningApp.WaitForElement("IssuePageLabel");
+			var element = RunningApp.WaitForElement("banktitleicon");
+
+			ClassicAssert.NotNull(element);
+
+			var elementRect = element.GetRect();
+			ClassicAssert.Greater(elementRect.Height, 10);
+			ClassicAssert.Greater(elementRect.Width, 10);
+		}
+	}
+}
+#endif
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6472.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6472.cs
new file mode 100644
index 000000000000..3d1a7e83d13d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6472.cs
@@ -0,0 +1,39 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue6472 : IssuesUITest
+	{
+		const string ListViewAutomationId = "TheListview";
+		const string ClearButtonAutomationId = "ClearButton";
+		const string UiThreadButtonAutomationId = "UiThreadButton";
+		const string OtherThreadButtonAutomationId = "OtherThreadButton";
+
+		public Issue6472(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug][iOS] listview / observable collection throwing native error on load";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[Ignore("Fails occasionally on iOS 12 https://github.com/xamarin/Xamarin.Forms/issues/6472")]
+		public void ListViewDoesNotThrowExceptionWithObservableCollection()
+		{
+			RunningApp.WaitForElement(ListViewAutomationId);
+			RunningApp.Screenshot("We got here without an exception while loading the data and data is visible");
+
+			RunningApp.Tap(ClearButtonAutomationId);
+			RunningApp.Tap(UiThreadButtonAutomationId);
+			RunningApp.Tap(OtherThreadButtonAutomationId);
+
+			RunningApp.Tap(ClearButtonAutomationId);
+			RunningApp.Tap(OtherThreadButtonAutomationId);
+			RunningApp.Tap(UiThreadButtonAutomationId);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6705.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6705.cs
new file mode 100644
index 000000000000..65effc639fea
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6705.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6705 : IssuesUITest
+	{
+		public Issue6705(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "InvokeOnMainThreadAsync throws NullReferenceException"; 
+		
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnIOS]
+		public void Issue6705Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			for (var i = 1; i < 6; i++)
+			{
+				RunningApp.WaitForElement($"Button{i}");
+				RunningApp.Tap($"Button{i}");
+				RunningApp.WaitForNoElement($"{i}");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6932.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6932.cs
new file mode 100644
index 000000000000..7eda762d8a2b
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6932.cs
@@ -0,0 +1,52 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue6932 : IssuesUITest
+	{
+		const string LayoutAutomationId = "StackLayoutThing";
+		const string AddAutomationId = "AddButton";
+		const string ClearAutomationId = "ClearButton";
+		const string EmptyViewAutomationId = "EmptyViewId";
+
+		public Issue6932(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "EmptyView for BindableLayout (view)";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void EmptyViewBecomesVisibleWhenItemsSourceIsCleared()
+		{
+			RunningApp.Screenshot("Screen opens, items are shown");
+
+			RunningApp.WaitForElement(LayoutAutomationId);
+			RunningApp.Tap(ClearAutomationId);
+			RunningApp.WaitForElement(EmptyViewAutomationId);
+
+			RunningApp.Screenshot("Empty view is visible");
+		}
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void EmptyViewHidesWhenItemsSourceIsFilled()
+		{
+			RunningApp.Screenshot("Screen opens, items are shown");
+
+			RunningApp.WaitForElement(LayoutAutomationId);
+			RunningApp.Tap(ClearAutomationId);
+			RunningApp.WaitForElement(EmptyViewAutomationId);
+
+			RunningApp.Screenshot("Items are cleared, empty view visible");
+
+			RunningApp.Tap(AddAutomationId);
+			RunningApp.WaitForNoElement(EmptyViewAutomationId);
+
+			RunningApp.Screenshot("Item is added, empty view is not visible");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6945.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6945.cs
new file mode 100644
index 000000000000..5dfafe3558e5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6945.cs
@@ -0,0 +1,33 @@
+#if IOS
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6945 : IssuesUITest
+	{
+		const string ClickMeId = "ClickMeAutomationId";
+		const string BoxViewId = "BoxViewAutomationId";
+
+		public Issue6945(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Wrong anchor behavior when setting HeightRequest ";
+
+		[Test]
+		[Category(UITestCategories.Layout)]
+		[FailsOnIOS]
+		public void WrongTranslationBehaviorWhenChangingHeightRequestAndSettingAnchor()
+		{
+			var rect = RunningApp.WaitForElement(BoxViewId).GetRect();
+			RunningApp.Tap(ClickMeId);
+			var rect2 = RunningApp.WaitForElement(BoxViewId).GetRect();
+
+			ClassicAssert.AreEqual(rect.X, rect2.X);
+			ClassicAssert.AreEqual(rect.Y, rect2.Y);
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6963.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6963.cs
new file mode 100644
index 000000000000..f1b3d4e7e95e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6963.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6963 : IssuesUITest
+	{
+		public Issue6963(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView multiple pre-selection throws ArgumentOutOfRangeException when SelectedItems is bound to an ObservableCollection initialized inside the constructor.";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void SelectedItemsNotInSourceDoesNotCrash()
+		{      
+			// If this page didn't crash, then we're good
+			RunningApp.WaitForElement("FirstLabel");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6994.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6994.cs
new file mode 100644
index 000000000000..e26dd0829cd6
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue6994.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue6994 : IssuesUITest
+	{
+		public Issue6994(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Regression in Xamarin.Forms 4.2.0-pre1 (Java.Lang.NullPointerException when using FastRenderers)"; 
+		
+		[Test]
+		[Category(UITestCategories.Button)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void NullPointerExceptionOnFastLabelTextColorChange()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("Click me");
+			RunningApp.Tap("Click me");
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7102.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7102.cs
new file mode 100644
index 000000000000..32f35496d3f9
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7102.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue7102 : IssuesUITest
+	{
+		public Issue7102(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView Header cause delay to adding items.";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void HeaderDoesNotBreakIndexes()
+		{
+			RunningApp.WaitForElement("entryInsert");
+			RunningApp.Tap("entryInsert");
+			RunningApp.ClearText("entryInsert");
+			RunningApp.EnterText("entryInsert", "1");
+			RunningApp.Tap("btnInsert");
+
+			// If the bug is still present, then there will be 
+			// two "Item: 0" items instead of the newly inserted item
+			// Or the header will have disappeared
+			RunningApp.WaitForNoElement("Inserted");
+			RunningApp.WaitForNoElement("This is the header");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7313.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7313.cs
new file mode 100644
index 000000000000..cc1517a74606
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7313.cs
@@ -0,0 +1,26 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue7313 : IssuesUITest
+	{
+		public Issue7313(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ListView RefreshControl Not Hiding";
+
+		[Test]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void RefreshControlTurnsOffSuccessfully()
+		{
+			RunningApp.WaitForNoElement("If you see the refresh circle this test has failed");
+
+			RunningApp.WaitForNoElement("RefreshControl");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7338.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7338.cs
new file mode 100644
index 000000000000..2be98a707f99
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7338.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue7338 : IssuesUITest
+	{
+		const string Success = "success";
+
+		public Issue7338(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView crash if source is empty in XF 4.2.0.709249";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void Issue3273Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+			
+			// If the instructions are visible at all, then this has succeeded
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7371.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7371.cs
new file mode 100644
index 000000000000..39f8932e9d62
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7371.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue7371 : IssuesUITest
+	{
+		public Issue7371(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "iOS race condition(or not checking for null) of refreshing(offset animation) causes NullReferenceException";
+
+		[Test]
+		[Category(UITestCategories.RefreshView)]
+		[FailsOnAndroid]
+		public async Task RefreshingListViewCrashesWhenDisposedTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			await Task.Delay(500);
+			RunningApp.WaitForElement("Success");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7393.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7393.cs
new file mode 100644
index 000000000000..def53587e0f5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7393.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue7393 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue7393(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView problems and crashes with IsGrouped=\"true\"";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void AddingItemsToGroupedCollectionViewShouldNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(Success, timeout: TimeSpan.FromSeconds(30));
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7534.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7534.cs
new file mode 100644
index 000000000000..b86f5eab3add
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue7534.cs
@@ -0,0 +1,28 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue7534 : IssuesUITest
+	{
+		public Issue7534(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Span with tail truncation and paragraph breaks with Java.Lang.IndexOutOfBoundsException";
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Category(UITestCategories.Label)]
+		[FailsOnAndroid]
+		public void ExpectingPageNotToBreak()
+		{
+			RunningApp.Screenshot("Test passed, label is showing as it should!");
+			//if it doesn't crash, we're good.
+		}
+		*/
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue773.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue773.cs
new file mode 100644
index 000000000000..b1b9ac8cdacc
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue773.cs
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue773 : IssuesUITest
+	{
+		public Issue773(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Horizontal ScrollView locks after rotation";
+
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		[FailsOnAndroid]
+		public void Issue773TestsRotationRelayoutIssue()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.SetOrientationLandscape();
+
+			var buttonLabels = new[] {
+				"Button1",
+				"Button2",
+				"Button3",
+			};
+
+			foreach (string buttonLabel in buttonLabels)
+				RunningApp.WaitForElement(buttonLabel);
+
+			RunningApp.Screenshot("StackLayout in Modal respects rotation");
+
+			RunningApp.SetOrientationPortrait();
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8004.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8004.cs
new file mode 100644
index 000000000000..62247d55830a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8004.cs
@@ -0,0 +1,41 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue8004 : IssuesUITest
+	{
+		const string AnimateBoxViewButton = "AnimateBoxViewButton";
+		const string BoxToScale = "BoxToScale";
+
+		public Issue8004(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Add a ScaleXTo and ScaleYTo animation extension method";
+
+		[Test]
+		[Category(UITestCategories.Animation)]
+		[FailsOnIOS]
+		public async Task AnimateScaleOfBoxView()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("Small blue box");
+
+			// Check the box and button elements.
+			RunningApp.WaitForElement(BoxToScale);
+			RunningApp.WaitForElement(AnimateBoxViewButton);
+
+			// Tap the button.
+			RunningApp.Tap(AnimateBoxViewButton);
+
+			// Wait for animation to finish.
+			await Task.Delay(500);
+
+			RunningApp.Screenshot("Bigger blue box");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8167.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8167.cs
new file mode 100644
index 000000000000..344adfd82855
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8167.cs
@@ -0,0 +1,27 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8167 : IssuesUITest
+	{
+		const string Run = "Update Text";
+		const string Success = "Success";
+
+		public Issue8167(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] XF 4.3 UWP Crash - Element not found";
+
+		[Test]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ThreadpoolBindingUpdateShouldNotCrash()
+		{
+			RunningApp.WaitForElement(Run);
+			RunningApp.Tap(Run);
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8262.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8262.cs
new file mode 100644
index 000000000000..3daba25d6d49
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8262.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8262 : IssuesUITest
+	{
+		public Issue8262(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] ImageRenderer still being accessed after control destroyed";
+
+		[Test]
+		[Category(UITestCategories.Image)]
+		[Category(UITestCategories.LifeCycle)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void ScrollingQuicklyOnCollectionViewDoesntCrashOnDestroyedImage()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("ScrollMe");
+			App.ScrollDown("ScrollMe", ScrollStrategy.Gesture, swipeSpeed: 20000);
+			App.ScrollUp("ScrollMe", ScrollStrategy.Gesture, swipeSpeed: 20000);
+			App.ScrollDown("ScrollMe", ScrollStrategy.Gesture, swipeSpeed: 20000);
+			App.ScrollUp("ScrollMe", ScrollStrategy.Gesture, swipeSpeed: 20000);
+			App.ScrollDown("ScrollMe", ScrollStrategy.Gesture, swipeSpeed: 20000);
+			RunningApp.WaitForElement("ScrollMe");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8263.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8263.cs
new file mode 100644
index 000000000000..669cef700048
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8263.cs
@@ -0,0 +1,30 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue8263 : IssuesUITest
+	{
+		public Issue8263(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Enhancement] Add On/Off VisualStates for Switch"; 
+		
+		[Test]
+		[Category(UITestCategories.Switch)]
+		[FailsOnIOS]
+		public void SwitchOnOffVisualStatesTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("Switch");
+			RunningApp.Screenshot("Switch Default");
+			RunningApp.Tap("Switch");
+			RunningApp.Screenshot("Switch Off with Red ThumbColor");
+			RunningApp.Tap("Switch");
+			RunningApp.Screenshot("Switch On with Green ThumbColor");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue852.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue852.cs
new file mode 100644
index 000000000000..05b3dea0f2a8
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue852.cs
@@ -0,0 +1,40 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue852 : IssuesUITest
+	{
+		const string UsernameId = "username852";
+		const string PasswordId = "password852";
+
+		public Issue852(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Async loading of Content causes UI element to be unclickable"; 
+
+		[Test]
+		[Category(UITestCategories.Entry)]
+		public void Issue852TestsEntriesClickable()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("WelcomeLabel");
+			RunningApp.WaitForElement(UsernameId);
+			RunningApp.WaitForElement(PasswordId);
+			RunningApp.WaitForElement("Login");
+			RunningApp.Screenshot("All elements present");
+
+			RunningApp.Tap(UsernameId);
+			RunningApp.WaitForElement("WelcomeLabel");
+			RunningApp.EnterText(UsernameId, "Usertest");
+			RunningApp.Screenshot("User entered");
+
+			RunningApp.Tap(PasswordId);
+			RunningApp.WaitForElement("WelcomeLabel");
+			RunningApp.EnterText(PasswordId, "Userpass");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8529.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8529.cs
new file mode 100644
index 000000000000..8b159ec69001
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8529.cs
@@ -0,0 +1,33 @@
+/*
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8529 : IssuesUITest
+	{
+		const string ButtonId = "ButtonId";
+
+		public Issue8529(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [Shell] iOS - BackButtonBehavior Command property binding throws InvalidCastException when using a custom command class that implements ICommand";
+		
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void Issue8529ShellBackButtonBehaviorCommandPropertyCanUseICommand()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(ButtonId, "Timed out waiting for first page.");
+			RunningApp.Tap(ButtonId);
+			RunningApp.WaitForElement("LabelId", "Timed out waiting for the destination page.");
+			RunningApp.Back();
+			RunningApp.WaitForElement(ButtonId, "Timed out waiting to navigate back to the first page.");
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8715.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8715.cs
new file mode 100644
index 000000000000..fcefde74ea99
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8715.cs
@@ -0,0 +1,33 @@
+#if IOS
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8715 : IssuesUITest
+	{
+		const string FlyoutIconAutomationId = "OK";
+
+		public Issue8715(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "NullReferenceException Microsoft.Maui.Controls.Platform.iOS.StructuredItemsViewRenderer [Bug]";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[Category(UITestCategories.Shell)]
+		public void ReappearingCollectionViewShouldNotThrowNRE()
+		{
+			RunningApp.Tap(FlyoutIconAutomationId);
+			RunningApp.Tap("CollectionView");
+			RunningApp.Tap("Toggle");
+			RunningApp.Tap("Toggle");
+			RunningApp.Tap(FlyoutIconAutomationId);
+			RunningApp.Tap("About");
+			RunningApp.Tap(FlyoutIconAutomationId);
+			RunningApp.Tap("CollectionView");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8766.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8766.cs
new file mode 100644
index 000000000000..b31fdc3438b3
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8766.cs
@@ -0,0 +1,23 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue8766 : IssuesUITest
+	{
+		public Issue8766(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView.EmptyView does not inherit parent Visual";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void VisualPropagatesToEmptyView()
+		{
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.Screenshot("CollectionViewWithEmptyView");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8801.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8801.cs
new file mode 100644
index 000000000000..e37468b8124a
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8801.cs
@@ -0,0 +1,26 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8801 : IssuesUITest
+	{
+		public Issue8801(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Android] Attempt to read from field 'int android.view.ViewGroup$LayoutParams.width' on a null object reference";
+
+		// Crash after navigation
+		/*
+		[Test]
+		[Category(UITestCategories.Layout)]
+		public void NotAddingElementsNativelyDoesntCrashAndroid()
+		{
+			RunningApp.WaitForElement("Success");
+		}
+		*/
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8814.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8814.cs
new file mode 100644
index 000000000000..ae4284a94ea2
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8814.cs
@@ -0,0 +1,28 @@
+/*
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8814 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue8814(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] UWP Shell cannot host CollectionView/CarouselView";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[Category(UITestCategories.Shell)]
+		public void CollectionViewInShellShouldBeVisible()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8870.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8870.cs
new file mode 100644
index 000000000000..897b4f5bfe58
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8870.cs
@@ -0,0 +1,47 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8870 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string CheckResult = "Check";
+
+		public Issue8870(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView with HTML Labels Freeze the Screen on Rotation";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public async Task RotatingCollectionViewWithHTMLShouldNotHangOrCrash()
+		{
+			int delay = 3000;
+
+			RunningApp.WaitForElement(CheckResult);
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationLandscape();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationLandscape();
+			await Task.Delay(delay);
+
+			RunningApp.SetOrientationPortrait();
+			await Task.Delay(delay);
+
+			RunningApp.WaitForElement(CheckResult);
+			RunningApp.Tap(CheckResult);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8899.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8899.cs
new file mode 100644
index 000000000000..7a7274d87431
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue8899.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue8899 : IssuesUITest
+	{
+		const string Go = "Go";
+		const string Success = "Success";
+
+		public Issue8899(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Clearing CollectionView IsGrouped=\"True\" crashes application iOS ";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void ClearingGroupedCollectionViewShouldNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(Go);
+			RunningApp.Tap(Go);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9006.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9006.cs
new file mode 100644
index 000000000000..4a2fc3ae8921
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9006.cs
@@ -0,0 +1,29 @@
+/*
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9006 : IssuesUITest
+	{
+		public Issue9006(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] Unable to open a new Page for the second time in Xamarin.Forms Shell Tabbar";
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void ClickingOnTabToPopToRootDoesntBreakNavigation()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("Click Me");
+			RunningApp.WaitForElement("FinalLabel");
+			RunningApp.Tap("Tab1AutomationId");
+			RunningApp.Tap("Click Me");
+			RunningApp.WaitForNoElement("Success");
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9087.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9087.cs
new file mode 100644
index 000000000000..47553af8641e
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9087.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9087 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue9087(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[UWP] Scrollview with null content crashes on UWP";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void BindablePropertiesAvailableAtOnElementChanged()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.iOS, TestDevice.Mac]);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9196.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9196.cs
new file mode 100644
index 000000000000..96c3a32c9280
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9196.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9196 : IssuesUITest
+	{
+		const string Success = "Success";
+
+		public Issue9196(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] [iOS] CollectionView EmptyView causes the application to crash";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void EmptyViewShouldNotCrash()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9306.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9306.cs
new file mode 100644
index 000000000000..a34ae171f0e6
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9306.cs
@@ -0,0 +1,39 @@
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9306 : IssuesUITest
+	{
+		const string SwipeViewId = "SwipeViewId";
+		const string SwipeItemId = "SwipeItemId";
+		const string LeftCountLabelId = "LeftCountLabel";
+
+		public Issue9306(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Cannot un-reveal swipe view items on iOS / Inconsistent swipe view behaviour";
+
+		[Test]
+		[Category(UITestCategories.SwipeView)]
+		[FailsOnIOS]
+		public void Issue9306SwipeViewCloseSwiping()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(SwipeViewId);
+
+			RunningApp.SwipeLeftToRight(SwipeViewId);
+			RunningApp.SwipeRightToLeft(SwipeViewId);
+			RunningApp.SwipeLeftToRight(SwipeViewId);
+
+			RunningApp.Tap(SwipeItemId);
+
+			var result = RunningApp.FindElement(LeftCountLabelId).GetText();
+
+			ClassicAssert.AreEqual("1", result);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue935.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue935.cs
new file mode 100644
index 000000000000..9eaf0e3f482d
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue935.cs
@@ -0,0 +1,29 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue935 : IssuesUITest
+	{
+		public Issue935(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ViewCell.ItemTapped only fires once for ListView.SelectedItem";
+
+		[Test]
+		[Description("Verify that OnTapped is fired every time a ViewCell is tapped")]
+		[Category(UITestCategories.ListView)]
+		[FailsOnIOS]
+		public void Issue935TestsMultipleOnTappedViewCell()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("TestLabel");
+			RunningApp.Screenshot("Tapped Cell Once");
+			RunningApp.Tap("TestLabel");
+			RunningApp.Screenshot("Tapped Cell Twice");
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9355.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9355.cs
new file mode 100644
index 000000000000..09eded366c6c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9355.cs
@@ -0,0 +1,26 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9355 : IssuesUITest
+	{
+		const string TestOk = "Test Ok";
+
+		public Issue9355(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "ScrollViewRenderer renderer dispose crash";
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.ScrollView)]
+		public void Issue9355Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForNoElement(TestOk);
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9419.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9419.cs
new file mode 100644
index 000000000000..cad195443164
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9419.cs
@@ -0,0 +1,25 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9419 : IssuesUITest
+	{
+		const string OkResult = "Ok";
+
+		public Issue9419(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Crash when toolbar item removed then page changed";
+
+		[Test]
+		[Category(UITestCategories.ToolbarItem)]
+		public void TestIssue9419()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(OkResult);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9580.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9580.cs
new file mode 100644
index 000000000000..6a0811b74e0c
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9580.cs
@@ -0,0 +1,28 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9580 : IssuesUITest
+	{
+		const string Success = "Success";
+		const string Test9580 = "9580";
+
+		public Issue9580(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] CollectionView - iOS - Crash when adding first item to empty item group";
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		public void AllEmptyGroupsShouldNotCrashOnItemInsert()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(Test9580);
+			RunningApp.Tap(Test9580);
+			RunningApp.WaitForElement(Success);
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue968.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue968.cs
new file mode 100644
index 000000000000..33a09dedb1af
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue968.cs
@@ -0,0 +1,32 @@
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+	public class Issue968 : IssuesUITest
+	{
+		public Issue968(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "StackLayout does not relayout on device rotation";
+
+		[Test]
+		[Description("Verify the layout lays out on rotations")]
+		[Category(UITestCategories.Layout)]
+		[FailsOnAndroid]
+		[FailsOnIOS]
+		public void Issue968TestsRotationRelayoutIssue()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("TestReady");
+			RunningApp.SetOrientationLandscape();
+			RunningApp.Screenshot("Rotated to Landscape");
+			RunningApp.WaitForNoElement("You should see me after rotating");
+			RunningApp.Screenshot("StackLayout in Modal respects rotation");
+			RunningApp.SetOrientationPortrait();
+		}
+	}
+}
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9794.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9794.cs
new file mode 100644
index 000000000000..7d5bd18150a7
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9794.cs
@@ -0,0 +1,34 @@
+/*
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9794 : IssuesUITest
+	{
+		public Issue9794(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[iOS] Tabbar Disappears with linker";
+		
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.Shell)]
+		public void EnsureTabBarStaysVisibleAfterPoppingPage()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.Tap("GoForward");
+			RunningApp.Back();
+			RunningApp.Tap("tab2");
+			RunningApp.Tap("tab1");
+			RunningApp.Tap("tab2");
+			RunningApp.Tap("tab1");
+			RunningApp.Tap("tab2");
+			RunningApp.Tap("tab1");
+		}
+	}
+}
+*/
\ No newline at end of file
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9929.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9929.cs
new file mode 100644
index 000000000000..676a625a94e5
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9929.cs
@@ -0,0 +1,33 @@
+using NUnit.Framework;
+using UITest.Appium;
+
+namespace UITests
+{
+	public class Issue9929 : IssuesUITest
+	{
+		public Issue9929(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "[Bug] NSInternalInconsistencyException when trying to run XamarinTV on iOS";
+
+		public override bool ResetMainPage => false;
+
+		[Test]
+		[Category(UITestCategories.CollectionView)]
+		[FailsOnIOS]
+		public void Issue3884Test()
+		{
+			this.IgnoreIfPlatforms([TestDevice.Android, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement("entryUpdate_Spacing");
+			RunningApp.Tap("entryUpdate_Spacing");
+			RunningApp.ClearText("entryUpdate_Spacing");
+			RunningApp.EnterText("entryUpdate_Spacing", "0,500");
+			RunningApp.Tap("btnUpdate_Spacing");
+
+			// If it hasn't crashed, we should still be able to find this
+			RunningApp.WaitForElement("entryUpdate_Spacing");
+		}
+	}
+}
diff --git a/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9951.cs b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9951.cs
new file mode 100644
index 000000000000..946a7c4bd628
--- /dev/null
+++ b/src/Compatibility/ControlGallery/test/Shared.Appium.UITests/Tests/Issues/Issue9951.cs
@@ -0,0 +1,37 @@
+#if ANDROID
+using NUnit.Framework;
+using UITest.Appium;
+using UITest.Core;
+
+namespace UITests
+{
+    public class Issue9951 : IssuesUITest
+	{
+		const string SwitchId = "switch";
+
+		public Issue9951(TestDevice testDevice) : base(testDevice)
+		{
+		}
+
+		public override string Issue => "Android 10 Setting ThumbColor on Switch causes a square block"; 
+		
+		[Test]
+		[Category(UITestCategories.Switch)]
+		public async Task SwitchColorTest()
+		{
+			this.IgnoreIfPlatforms([TestDevice.iOS, TestDevice.Mac, TestDevice.Windows]);
+
+			RunningApp.WaitForElement(SwitchId);
+
+			RunningApp.Screenshot("Initial switch state");
+
+			RunningApp.Tap(SwitchId);
+
+			//Delay so that the switch toggling is finished
+			await Task.Delay(200);
+
+			RunningApp.Screenshot("Toggled switch state");
+		}
+	}
+}
+#endif
\ No newline at end of file
diff --git a/src/TestUtils/src/UITest.Appium/AppiumApp.cs b/src/TestUtils/src/UITest.Appium/AppiumApp.cs
index 91d792078391..7ce89830c8d5 100644
--- a/src/TestUtils/src/UITest.Appium/AppiumApp.cs
+++ b/src/TestUtils/src/UITest.Appium/AppiumApp.cs
@@ -111,6 +111,7 @@ protected static void SetGeneralAppiumOptions(IConfig config, AppiumOptions appi
 			if (!string.IsNullOrWhiteSpace(testName))
 				appiumOptions.AddAdditionalAppiumOption("testName", testName);
 
+			// Reset Strategies: https://appium.readthedocs.io/en/stable/en/writing-running-appium/other/reset-strategies/
 			if (config.GetProperty<bool>("FullReset"))
 				appiumOptions.AddAdditionalAppiumOption(MobileCapabilityType.FullReset, "true");