diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs
index 0fd32ecdc..5b92b2c02 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewBindingErrors.xaml.cs
@@ -26,8 +26,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public CollectionViewBindingErrors()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			var listener = new CountBindingErrors(BindingErrorCount);
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs
index 76456ded5..3940cb41b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewGroupTypeIssue.cs
@@ -25,7 +25,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(TestPage());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs
index 73d174655..0429140f2 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterString.cs
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.HeaderFooterGalleries.HeaderFooterString());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs
index 1997eec03..2d4de060f 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterTemplate.cs
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.HeaderFooterGalleries.HeaderFooterTemplate());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs
index 108cb5bc6..4a7446a93 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewHeaderFooterView.cs
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.HeaderFooterGalleries.HeaderFooterView());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs
index f5cdef9f9..c3cca7e68 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/CollectionViewItemsSourceTypes.cs
@@ -23,9 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 	{
 		protected override void Init()
 		{
-#if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-#endif
 			Content = new StackLayout()
 			{
 				Children =
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs
index dfd49be38..b44a9ddc2 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/FlagTestHelpers.cs
@@ -9,7 +9,7 @@ namespace Xamarin.Forms.Controls.Issues
 			Device.SetFlags(new List<string>(Device.Flags ?? new List<string>()) { flag });
 		}
 
-		public static void SetCollectionViewTestFlag()
+		public static void SetCarouselViewTestFlag()
 		{
 			SetTestFlag("CollectionView_Experimental");
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
index dc5d04e62..32d21ffce 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Github5623.xaml.cs
@@ -36,8 +36,6 @@ namespace Xamarin.Forms.Controls.Issues
 
 		public Github5623()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			BindingContext = new ViewModel5623();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs
index 565c690c5..ab0a1454c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5354.xaml.cs
@@ -30,8 +30,6 @@ namespace Xamarin.Forms.Controls.Issues
 #if APP
 		public Issue5354()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			BindingContext = new ViewModel5354();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs
index fff590fde..c0e87ee2b 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5535.cs
@@ -23,8 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.EmptyViewGalleries.EmptyViewSwapGallery());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs
index 97effb527..d4f692b9e 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5765.cs
@@ -23,8 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 
 		protected override void Init()
 		{
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(CreateRoot());
 		}
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs
index 93a5830d5..b61942002 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue5949.cs
@@ -26,7 +26,6 @@ namespace Xamarin.Forms.Controls.Issues
 	{
 		protected override void Init()
 		{
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			Appearing += Issue5949Appearing;
 		}
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs
index e331752f4..cfd193713 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6609.cs
@@ -23,8 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.SelectionGalleries.SelectionChangedCommandParameter());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs
index c643db08b..8df064f29 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6644.xaml.cs
@@ -14,7 +14,6 @@ namespace Xamarin.Forms.Controls.Issues
 #if APP
 		public Issue6644()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
 			InitializeComponent();
 			cv.ItemsSource = new ObservableCollection<int>(Enumerable.Range(0, 10).ToList());
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs
index 99fba59d3..5194eb9a0 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue6963.cs
@@ -23,8 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.SelectionGalleries.SelectionSynchronization());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs
index 8177ae4b2..2d7d78018 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7102.cs
@@ -23,8 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
-
 			PushAsync(new GalleryPages.CollectionViewGalleries.ObservableCodeCollectionViewGallery(grid: false));
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs
index d47650c4e..7faef9cb7 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7128.cs
@@ -23,7 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 	{
 		protected override void Init()
 		{
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(CreateRoot());
 		}
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs
index 1f422d876..84d990468 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7338.cs
@@ -24,7 +24,6 @@ namespace Xamarin.Forms.Controls.Issues
 
 		protected override void Init()
 		{
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(CreateRoot());
 		}
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs
index 59d421c99..06fdbd594 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7357.xaml.cs
@@ -34,8 +34,6 @@ namespace Xamarin.Forms.Controls.Issues
 
 		public Issue7357()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			(CollectionView7357.ItemsLayout as LinearItemsLayout).ItemSpacing = 5;
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
index 29a34c5e9..b691b559c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7512.xaml.cs
@@ -30,8 +30,6 @@ namespace Xamarin.Forms.Controls.Issues
 #if APP
 		public Issue7512()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			BindingContext = new ViewModel7512();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs
index a8bc0eba9..8331d409e 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7519.cs
@@ -23,7 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(new Issue7519Xaml());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs
index bd1c9c099..1b9612f69 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7593.xaml.cs
@@ -32,8 +32,6 @@ namespace Xamarin.Forms.Controls.Issues
 #if APP
 		public Issue7593()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			BindingContext = new ViewModel7593();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs
index f85d4ec4a..3051a1c8c 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7621.xaml.cs
@@ -32,8 +32,6 @@ namespace Xamarin.Forms.Controls.Issues
 #if APP
 		public Issue7621()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 
 			BindingContext = new ViewModel7621();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs
index 2794be78a..3e585453e 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7758.xaml.cs
@@ -11,8 +11,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7758()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
-
 			InitializeComponent();
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs
index d9046aa12..4ba461b26 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7789.xaml.cs
@@ -25,7 +25,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7789()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
 			InitializeComponent();
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs
index 1d89caf50..3a429cbf1 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7792.xaml.cs
@@ -18,7 +18,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7792()
 		{
 #if APP
- 			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
 			InitializeComponent();
 #endif
 			BindingContext = new Issue7792ViewModel();
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs
index d981744e1..bae6429de 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7817.xaml.cs
@@ -29,7 +29,7 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7817()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
+			Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
 			Title = "Issue 7817";
 			InitializeComponent();
 #endif
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs
index 50a33eb0c..58ef8081d 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7865.xaml.cs
@@ -26,7 +26,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7865()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
 			Title = "Issue 7865";
 			InitializeComponent();
 #endif
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs
index 7837f7379..c15da0a81 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/Issue7943.xaml.cs
@@ -26,7 +26,6 @@ namespace Xamarin.Forms.Controls.Issues
 		public Issue7943()
 		{
 #if APP
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
 			Title = "Issue 7943";
 			InitializeComponent();
 
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs
index 7bc5ab044..9c10d73f4 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/NestedCollectionViews.cs
@@ -24,7 +24,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(new GalleryPages.CollectionViewGalleries.NestedGalleries.NestedCollectionViewGallery());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs
index 469d86080..bb2d51033 100644
--- a/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs
+++ b/Xamarin.Forms.Controls.Issues/Xamarin.Forms.Controls.Issues.Shared/ScrollToGroup.cs
@@ -23,7 +23,6 @@ namespace Xamarin.Forms.Controls.Issues
 		protected override void Init()
 		{
 #if APP
-			FlagTestHelpers.SetCollectionViewTestFlag();
 			PushAsync(new GalleryPages.CollectionViewGalleries.ScrollToGalleries.ScrollToGroup());
 #endif
 		}
diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs b/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs
index f1d637684..0e5e4cd53 100644
--- a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CarouselViewGalleries/CarouselViewGallery.cs
@@ -14,8 +14,8 @@ namespace Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries.CarouselVi
 
 			var button = new Button
 			{
-				Text = "Enable CollectionView",
-				AutomationId = "EnableCollectionView"
+				Text = "Enable CarouselView",
+				AutomationId = "EnableCarouselView"
 			};
 			button.Clicked += ButtonClicked;
 
@@ -50,11 +50,11 @@ namespace Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries.CarouselVi
 		{
 			var button = sender as Button;
 
-			button.Text = "CollectionView Enabled!";
+			button.Text = "CarouselView Enabled!";
 			button.TextColor = Color.Black;
 			button.IsEnabled = false;
 
-			Device.SetFlags(new[] { ExperimentalFlags.CollectionViewExperimental });
+			Device.SetFlags(new[] { ExperimentalFlags.CarouselViewExperimental });
 		}
 	}
 }
\ No newline at end of file
diff --git a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs b/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs
index 65101e523..499ed42f9 100644
--- a/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/CollectionViewGalleries/CollectionViewGallery.cs
@@ -14,20 +14,12 @@ namespace Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries
 	{
 		public CollectionViewGallery()
 		{
-			var button = new Button
-			{
-				Text = "Enable CollectionView",
-				AutomationId = "EnableCollectionView"
-			};
-			button.Clicked += ButtonClicked;
-
 			Content = new ScrollView
 			{
 				Content = new StackLayout
 				{
 					Children =
 					{
-						button,
 						GalleryBuilder.NavButton("Default Text Galleries", () => new DefaultTextGallery(), Navigation),
 						GalleryBuilder.NavButton("DataTemplate Galleries", () => new DataTemplateGallery(), Navigation),
 						GalleryBuilder.NavButton("Observable Collection Galleries", () => new ObservableCollectionGallery(), Navigation),
@@ -47,16 +39,5 @@ namespace Xamarin.Forms.Controls.GalleryPages.CollectionViewGalleries
 				}
 			};
 		}
-
-		void ButtonClicked(object sender, System.EventArgs e)
-		{
-			var button = sender as Button;
-
-			button.Text = "CollectionView Enabled!";
-			button.TextColor = Color.Black;
-			button.IsEnabled = false;
-
-			Device.SetFlags(new[] { ExperimentalFlags.CollectionViewExperimental });
-		}
 	}
 }
diff --git a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs b/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs
index 4653a7d1a..d23f5277b 100644
--- a/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs
+++ b/Xamarin.Forms.Controls/GalleryPages/RefreshViewGalleries/RefreshViewGallery.cs
@@ -15,7 +15,6 @@ namespace Xamarin.Forms.Controls.GalleryPages.RefreshViewGalleries
 			{
 				Children =
 				{
-					new Button { Text ="Enable CollectionView", AutomationId = "EnableCollectionView", Command = new Command(() => Device.SetFlags(new[] { ExperimentalFlags.CollectionViewExperimental })) },
 					GalleryBuilder.NavButton("Refresh Layout Gallery", () => new RefreshLayoutGallery(), Navigation),
 					GalleryBuilder.NavButton("Refresh ScrollView Gallery", () => new RefreshScrollViewGallery(), Navigation),
 					GalleryBuilder.NavButton("Refresh ListView Gallery", () => new RefreshListViewGallery(), Navigation),
diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs b/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs
index a6360f03f..bea4aadde 100644
--- a/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs
+++ b/Xamarin.Forms.Core.UITests.Shared/Tests/CarouselViewUITests.cs
@@ -7,16 +7,17 @@ namespace Xamarin.Forms.Core.UITests
 	[Category(UITestCategories.CarouselView)]
 	internal class CarouselViewUITests : BaseTestFixture
 	{
-		string _enableCollectionView = "Enable CollectionView";
+		string _enableControl = "Enable CarouselView";
 		string _carouselViewGalleries = "CarouselView Galleries";
 
 		protected override void NavigateToGallery()
 		{
 			App.NavigateToGallery(GalleryQueries.CollectionViewGallery);
 
-			App.WaitForElement(_enableCollectionView);
-			App.Tap(_enableCollectionView);
+			App.WaitForElement(_carouselViewGalleries);
 			App.Tap(_carouselViewGalleries);
+			App.WaitForElement(_enableControl);
+			App.Tap(_enableControl);
 		}
 
 		[TestCase("CarouselView (Code, Horizontal)")]
diff --git a/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs b/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs
index 271b3fea7..9aad83671 100644
--- a/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs
+++ b/Xamarin.Forms.Core.UITests.Shared/Tests/CollectionViewUITests.cs
@@ -6,7 +6,6 @@ namespace Xamarin.Forms.Core.UITests
 	internal class CollectionViewUITests : BaseTestFixture
 	{
 		string _collectionViewId = "collectionview";
-		string _enableCollectionView = "Enable CollectionView";
 		string _btnUpdate = "Update";
 		string _entryUpdate = "entryUpdate";
 		string _entryInsert = "entryInsert";
@@ -170,8 +169,6 @@ namespace Xamarin.Forms.Core.UITests
 		void VisitInitialGallery(string collectionTestName)
 		{
 			var galeryName = $"{collectionTestName} Galleries";
-			App.WaitForElement(t => t.Marked(_enableCollectionView));
-			App.Tap(t => t.Marked(_enableCollectionView));
 
 			App.WaitForElement(t => t.Marked(galeryName));
 			App.Tap(t => t.Marked(galeryName));
diff --git a/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs b/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs
index 2946fa6d5..417dfab25 100644
--- a/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/CarouselViewTests.cs
@@ -12,7 +12,7 @@ namespace Xamarin.Forms.Core.UnitTests
 		[SetUp]
 		public override void Setup()
 		{
-			Device.SetFlags(new List<string> { CollectionView.CollectionViewExperimental });
+			Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental });
 			base.Setup();
 			var mockDeviceInfo = new TestDeviceInfo();
 			Device.Info = mockDeviceInfo;
diff --git a/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs b/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs
index d30edde67..437e02219 100644
--- a/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs
+++ b/Xamarin.Forms.Core.UnitTests/ItemsViewTests.cs
@@ -10,7 +10,7 @@ namespace Xamarin.Forms.Core.UnitTests
 		[SetUp]
 		public override void Setup()
 		{
-			Device.SetFlags(new List<string> {CollectionView.CollectionViewExperimental}); 
+			Device.SetFlags(new List<string> { ExperimentalFlags.CarouselViewExperimental }); 
 			base.Setup();
 			var mockDeviceInfo = new TestDeviceInfo();
 			Device.Info = mockDeviceInfo;
diff --git a/Xamarin.Forms.Core/ExperimentalFlags.cs b/Xamarin.Forms.Core/ExperimentalFlags.cs
index 4e5500c25..64739f4a4 100644
--- a/Xamarin.Forms.Core/ExperimentalFlags.cs
+++ b/Xamarin.Forms.Core/ExperimentalFlags.cs
@@ -9,8 +9,9 @@ namespace Xamarin.Forms
 {
 	internal static class ExperimentalFlags
 	{
-		internal const string CollectionViewExperimental = "CollectionView_Experimental";
 		internal const string ShellUWPExperimental = "Shell_UWP_Experimental";
+		internal const string CarouselViewExperimental = "CarouselView_Experimental";
+		internal const string CollectionViewExperimental = "CollectionView_Experimental";
 
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		public static void VerifyFlagEnabled(
diff --git a/Xamarin.Forms.Core/Items/CarouselView.cs b/Xamarin.Forms.Core/Items/CarouselView.cs
index 479b9df50..6b23e0a1e 100644
--- a/Xamarin.Forms.Core/Items/CarouselView.cs
+++ b/Xamarin.Forms.Core/Items/CarouselView.cs
@@ -5,6 +5,7 @@ using System.ComponentModel;
 using System.Windows.Input;
 using Xamarin.Forms.Platform;
 using System.Linq;
+using System.Runtime.CompilerServices;
 
 namespace Xamarin.Forms
 {
@@ -173,7 +174,7 @@ namespace Xamarin.Forms
 
 		public CarouselView()
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(constructorHint: nameof(CarouselView));
+			VerifyCarouselViewFlagEnabled(constructorHint: nameof(CarouselView));
 			ItemsLayout = new LinearItemsLayout(ItemsLayoutOrientation.Horizontal)
 			{
 				SnapPointsType = SnapPointsType.MandatorySingle,
@@ -182,6 +183,24 @@ namespace Xamarin.Forms
 			ItemSizingStrategy = ItemSizingStrategy.None;
 		}
 
+		[EditorBrowsable(EditorBrowsableState.Never)]
+		public static void VerifyCarouselViewFlagEnabled(
+			string constructorHint = null,
+			[CallerMemberName] string memberName = "")
+		{
+			try
+			{
+				ExperimentalFlags.VerifyFlagEnabled(nameof(CollectionView), ExperimentalFlags.CarouselViewExperimental,
+					constructorHint, memberName);
+			}
+			catch (InvalidOperationException)
+			{
+				// We'll still honor the CollectionView_Experimental flag for CarouselView stuff
+				ExperimentalFlags.VerifyFlagEnabled(nameof(CollectionView), ExperimentalFlags.CollectionViewExperimental,
+					constructorHint, memberName);
+			}
+		}
+
 		protected virtual void OnPositionChanged(PositionChangedEventArgs args)
 		{
 		}
diff --git a/Xamarin.Forms.Core/Items/CollectionView.cs b/Xamarin.Forms.Core/Items/CollectionView.cs
index 00211416f..fe1392fde 100644
--- a/Xamarin.Forms.Core/Items/CollectionView.cs
+++ b/Xamarin.Forms.Core/Items/CollectionView.cs
@@ -12,19 +12,5 @@ namespace Xamarin.Forms
 	[RenderWith(typeof(_CollectionViewRenderer))]
 	public class CollectionView : GroupableItemsView
 	{
-		internal const string CollectionViewExperimental = "CollectionView_Experimental";
-
-		public CollectionView()
-		{
-			VerifyCollectionViewFlagEnabled(constructorHint: nameof(CollectionView));
-		}
-
-		[EditorBrowsable(EditorBrowsableState.Never)]
-		public static void VerifyCollectionViewFlagEnabled(
-			string constructorHint = null,
-			[CallerMemberName] string memberName = "")
-		{
-			ExperimentalFlags.VerifyFlagEnabled(nameof(CollectionView), ExperimentalFlags.CollectionViewExperimental);
-		}
 	}
 }
diff --git a/Xamarin.Forms.Core/Items/ItemsLayout.cs b/Xamarin.Forms.Core/Items/ItemsLayout.cs
index 76c959084..173122606 100644
--- a/Xamarin.Forms.Core/Items/ItemsLayout.cs
+++ b/Xamarin.Forms.Core/Items/ItemsLayout.cs
@@ -6,7 +6,6 @@
 
 		protected ItemsLayout([Parameter("Orientation")] ItemsLayoutOrientation orientation)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(constructorHint: nameof(ItemsLayout));
 			Orientation = orientation;
 		}
 
diff --git a/Xamarin.Forms.Core/Items/ItemsView.cs b/Xamarin.Forms.Core/Items/ItemsView.cs
index f35fc8cea..05c1a439e 100644
--- a/Xamarin.Forms.Core/Items/ItemsView.cs
+++ b/Xamarin.Forms.Core/Items/ItemsView.cs
@@ -11,11 +11,6 @@ namespace Xamarin.Forms
 	{
 		List<Element> _logicalChildren = new List<Element>();
 
-		protected internal ItemsView()
-		{
-			CollectionView.VerifyCollectionViewFlagEnabled(constructorHint: nameof(ItemsView));
-		}
-
 		public static readonly BindableProperty EmptyViewProperty =
 			BindableProperty.Create(nameof(EmptyView), typeof(object), typeof(ItemsView), null);
 
diff --git a/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs b/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs
index f0efea33b..703376768 100644
--- a/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs
+++ b/Xamarin.Forms.Core/Items/ScrollToRequestEventArgs.cs
@@ -18,8 +18,6 @@ namespace Xamarin.Forms
 		public ScrollToRequestEventArgs(int index, int groupIndex, 
 			ScrollToPosition scrollToPosition, bool isAnimated)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(ScrollToRequestEventArgs));
-
 			Mode = ScrollToMode.Position;
 
 			Index = index;
@@ -31,8 +29,6 @@ namespace Xamarin.Forms
 		public ScrollToRequestEventArgs(object item, object group, 
 			ScrollToPosition scrollToPosition, bool isAnimated)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(ScrollToRequestEventArgs));
-
 			Mode = ScrollToMode.Element;
 
 			Item = item;
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
index 021cb070b..38795190b 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/CarouselViewRenderer.cs
@@ -2,7 +2,7 @@ using System;
 using System.ComponentModel;
 using Android.Content;
 using Android.Views;
-using FormsCollectionView = Xamarin.Forms.CollectionView;
+using FormsCarouselView = Xamarin.Forms.CarouselView;
 
 namespace Xamarin.Forms.Platform.Android
 {
@@ -16,7 +16,7 @@ namespace Xamarin.Forms.Platform.Android
 
 		public CarouselViewRenderer(Context context) : base(context)
 		{
-			FormsCollectionView.VerifyCollectionViewFlagEnabled(nameof(CarouselViewRenderer));
+			FormsCarouselView.VerifyCarouselViewFlagEnabled(nameof(CarouselViewRenderer));
 		}
 
 		protected override void Dispose(bool disposing)
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
index e11066980..47c10d899 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/EmptyViewAdapter.cs
@@ -43,7 +43,6 @@ namespace Xamarin.Forms.Platform.Android
 
 		public EmptyViewAdapter(ItemsView itemsView)
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(EmptyViewAdapter));
 			ItemsView = itemsView;
 		}
 
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
index e72d75cb6..400da145e 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewAdapter.cs
@@ -22,8 +22,6 @@ namespace Xamarin.Forms.Platform.Android
 
 		internal ItemsViewAdapter(TItemsView itemsView, Func<View, Context, ItemContentView> createItemContentView = null)
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemsViewAdapter<TItemsView, TItemsViewSource>));
-
 			ItemsView = itemsView ?? throw new ArgumentNullException(nameof(itemsView));
 
 			UpdateUsingItemTemplate();
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
index 3aeda94e7..af0acc1ef 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/ItemsViewRenderer.cs
@@ -42,8 +42,6 @@ namespace Xamarin.Forms.Platform.Android
 
 		public ItemsViewRenderer(Context context) : base(new ContextThemeWrapper(context, Resource.Style.collectionViewStyle))
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemsViewRenderer<TItemsView, TAdapter, TItemsViewSource>));
-
 			_automationPropertiesProvider = new AutomationPropertiesProvider(this);
 			_effectControlProvider = new EffectControlProvider(this);
 
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs b/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
index 8f97d9b9f..369d7297c 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/PositionalSmoothScroller.cs
@@ -9,7 +9,6 @@ namespace Xamarin.Forms.Platform.Android
 
 		public PositionalSmoothScroller(Context context, ScrollToPosition scrollToPosition) : base(context)
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(PositionalSmoothScroller));
 			_scrollToPosition = scrollToPosition;
 		}
 
diff --git a/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs b/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs
index 0b63d6ef2..485afc3ce 100644
--- a/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs
+++ b/Xamarin.Forms.Platform.Android/CollectionView/SnapManager.cs
@@ -11,7 +11,6 @@ namespace Xamarin.Forms.Platform.Android
 
 		public SnapManager(IItemsLayout itemsLayout, RecyclerView recyclerView)
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(SnapManager));
 			_itemsLayout = itemsLayout;
 			_recyclerView = recyclerView;
 		}
diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
index d129b47bc..61a88b9e0 100644
--- a/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
+++ b/Xamarin.Forms.Platform.UAP/CollectionView/CarouselViewRenderer.cs
@@ -16,7 +16,7 @@ namespace Xamarin.Forms.Platform.UWP
 		ScrollViewer _scrollViewer;
 		public CarouselViewRenderer()
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(CarouselView));
+			CarouselView.VerifyCarouselViewFlagEnabled(nameof(CarouselView));
 		}
 
 		CarouselView CarouselView => Element;
diff --git a/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs b/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
index 1a0393080..158a07f73 100644
--- a/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
+++ b/Xamarin.Forms.Platform.UAP/CollectionView/ItemContentControl.cs
@@ -13,7 +13,6 @@ namespace Xamarin.Forms.Platform.UWP
 
 		public ItemContentControl()
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemContentControl));
 			DefaultStyleKey = typeof(ItemContentControl);
 		}
 
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs b/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs
index 236d4f26e..eb267967b 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/CarouselViewRenderer.cs
@@ -8,7 +8,7 @@ namespace Xamarin.Forms.Platform.iOS
 
 		public CarouselViewRenderer()
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(CarouselViewRenderer));
+			CarouselView.VerifyCarouselViewFlagEnabled(nameof(CarouselViewRenderer));
 		}
 
 		protected override CarouselViewController CreateController(CarouselView newElement, ItemsViewLayout layout)
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs b/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs
index 34ba36098..0edb01e2a 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/DefaultCell.cs
@@ -14,8 +14,6 @@ namespace Xamarin.Forms.Platform.iOS
 		[Export("initWithFrame:")]
 		protected DefaultCell(CGRect frame) : base(frame)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(DefaultCell));
-
 			Label = new UILabel(frame)
 			{
 				TextColor = UIColor.Black,
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs
index 31d1b44c3..1b50520dc 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewCell.cs
@@ -10,7 +10,6 @@ namespace Xamarin.Forms.Platform.iOS
 		[Export("initWithFrame:")]
 		protected ItemsViewCell(CGRect frame) : base(frame)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemsViewCell));
 			ContentView.BackgroundColor = UIColor.Clear;
 
 			var selectedBackgroundView = new UIView
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs
index 74fad4a1d..728bbee4d 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewLayout.cs
@@ -20,8 +20,6 @@ namespace Xamarin.Forms.Platform.iOS
 
 		protected ItemsViewLayout(ItemsLayout itemsLayout, ItemSizingStrategy itemSizingStrategy)
 		{
-			Xamarin.Forms.CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemsViewLayout));
-
 			ItemSizingStrategy = itemSizingStrategy;
 
 			_itemsLayout = itemsLayout;
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs
index 97bf1446e..e06d2adf4 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/ItemsViewRenderer.cs
@@ -15,10 +15,7 @@ namespace Xamarin.Forms.Platform.iOS
 
 		protected TItemsView ItemsView => Element;
 
-		public ItemsViewRenderer()
-		{
-			CollectionView.VerifyCollectionViewFlagEnabled(nameof(ItemsViewRenderer<TItemsView, TViewController>));
-		}
+
 
 		public override UIViewController ViewController => Controller;
 
diff --git a/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs b/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs
index 0c2d987ee..1d036a769 100644
--- a/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs
+++ b/Xamarin.Forms.Platform.iOS/CollectionView/ScrollToPositionExtensions.cs
@@ -7,8 +7,6 @@ namespace Xamarin.Forms.Platform.iOS
 		public static UICollectionViewScrollPosition ToCollectionViewScrollPosition(this ScrollToPosition scrollToPosition, 
 			UICollectionViewScrollDirection scrollDirection = UICollectionViewScrollDirection.Vertical, bool isLtr = false)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled();
-
 			if (scrollDirection == UICollectionViewScrollDirection.Horizontal)
 			{
 				return scrollToPosition.ToHorizontalCollectionViewScrollPosition(isLtr);
@@ -19,8 +17,6 @@ namespace Xamarin.Forms.Platform.iOS
 
 		public static UICollectionViewScrollPosition ToHorizontalCollectionViewScrollPosition(this ScrollToPosition scrollToPosition, bool isLtr)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled();
-
 			switch (scrollToPosition)
 			{
 				case ScrollToPosition.MakeVisible:
@@ -37,8 +33,6 @@ namespace Xamarin.Forms.Platform.iOS
 
 		public static UICollectionViewScrollPosition ToVerticalCollectionViewScrollPosition(this ScrollToPosition scrollToPosition)
 		{
-			CollectionView.VerifyCollectionViewFlagEnabled();
-
 			switch (scrollToPosition)
 			{
 				case ScrollToPosition.MakeVisible: