diff --git a/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-hwrap-page.xml b/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-hwrap-page.xml
new file mode 100644
index 000000000..a9bd96a63
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-hwrap-page.xml
@@ -0,0 +1,10 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments">
+
+    <ActionBar>
+        <Label text="Action Bar"></Label>
+    </ActionBar>
+
+    <fragments:vwrap-nested-hwrap-fragment></fragments:vwrap-nested-hwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-vwrap-page.xml b/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-vwrap-page.xml
new file mode 100644
index 000000000..b06e4284c
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/action-bar/vwrap-nested-vwrap-page.xml
@@ -0,0 +1,10 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments">
+
+    <ActionBar>
+        <Label text="Action Bar"></Label>
+    </ActionBar>
+
+    <fragments:vwrap-nested-vwrap-fragment></fragments:vwrap-nested-vwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-hwrap-fragment.xml b/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-hwrap-fragment.xml
new file mode 100644
index 000000000..4719a7aae
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-hwrap-fragment.xml
@@ -0,0 +1,42 @@
+<WrapLayout orientation="vertical" backgroundColor="LightGreen">
+    <WrapLayout orientation="horizontal" backgroundColor="LightPink">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightBlue">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightYellow">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightGray">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightPink">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightBlue">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightYellow">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="horizontal" backgroundColor="LightGray">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+</WrapLayout>
diff --git a/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-vwrap-fragment.xml b/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-vwrap-fragment.xml
new file mode 100644
index 000000000..045754a02
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/fragments/vwrap-nested-vwrap-fragment.xml
@@ -0,0 +1,42 @@
+<WrapLayout orientation="vertical" backgroundColor="LightGreen">
+    <WrapLayout orientation="vertical" backgroundColor="LightPink">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightBlue">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightYellow">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightGray">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightPink">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightBlue">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightYellow">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+    <WrapLayout orientation="vertical" backgroundColor="LightGray">
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+        <Button text="Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet Lorem ipsum dolor sit amet"></Button>
+    </WrapLayout>
+</WrapLayout>
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-hwrap-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-hwrap-page.xml
new file mode 100644
index 000000000..8028389b1
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-hwrap-page.xml
@@ -0,0 +1,6 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
+
+    <fragments:vwrap-nested-hwrap-fragment></fragments:vwrap-nested-hwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-vwrap-page.xml b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-vwrap-page.xml
new file mode 100644
index 000000000..2b1d2e965
--- /dev/null
+++ b/e2e/safe-area/app/wraplayout/no-action-bar/vwrap-nested-vwrap-page.xml
@@ -0,0 +1,6 @@
+<Page xmlns="http://schemas.nativescript.org/tns.xsd"
+    xmlns:fragments="wraplayout/fragments" actionBarHidden="true">
+
+    <fragments:vwrap-nested-vwrap-fragment></fragments:vwrap-nested-vwrap-fragment>
+
+</Page>
diff --git a/e2e/safe-area/app/wraplayout/wraplayout-page.xml b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
index d1898cba7..0af60cdf7 100644
--- a/e2e/safe-area/app/wraplayout/wraplayout-page.xml
+++ b/e2e/safe-area/app/wraplayout/wraplayout-page.xml
@@ -11,6 +11,8 @@
             <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-hwrap-page"></Button>
             <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/hwrap-nested-vwrap-page"></Button>
             <Button text="VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-page"></Button>
+            <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-hwrap-page"></Button>
+            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/action-bar/vwrap-nested-vwrap-page"></Button>
         </StackLayout>
         <StackLayout horizontalAlignment="center">
             <Label text="Pages w/o ActionBar"></Label>
@@ -18,6 +20,8 @@
             <Button text="HWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-hwrap-page"></Button>
             <Button text="HWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/hwrap-nested-vwrap-page"></Button>
             <Button text="VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-page"></Button>
+            <Button text="VWrap Nested HWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-hwrap-page"></Button>
+            <Button text="VWrap Nested VWrap" tap="onNavigate" route="wraplayout/no-action-bar/vwrap-nested-vwrap-page"></Button>
         </StackLayout>
         <StackLayout horizontalAlignment="center">
             <Label text="Docs Pages"></Label>