diff --git a/packages/fiori/src/UploadCollection.hbs b/packages/fiori/src/UploadCollection.hbs
index 9f208e88c53c..9cda1005c3f5 100644
--- a/packages/fiori/src/UploadCollection.hbs
+++ b/packages/fiori/src/UploadCollection.hbs
@@ -20,7 +20,7 @@
 					<ui5-icon name="document"></ui5-icon>
 				</div>
 				<ui5-title level="H2" wrapping-type="Normal">{{_noDataText}}</ui5-title>
-				<ui5-label class="subtitle" wrap>{{_noDataDescription}}</ui5-label>
+				<ui5-label class="subtitle" wrapping-type="Normal">{{_noDataDescription}}</ui5-label>
 			</div>
 		{{else if _showDndOverlay}}
 			<div
diff --git a/packages/fiori/test/pages/FCL.html b/packages/fiori/test/pages/FCL.html
index 344793d35954..914c1449281d 100644
--- a/packages/fiori/test/pages/FCL.html
+++ b/packages/fiori/test/pages/FCL.html
@@ -92,7 +92,7 @@
 							The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 						</ui5-messagestrip><br>
 
-						<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+						<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 						</ui5-label>
 						<ui5-button id="btnOpenDialog" style="width: 150px; align-self: flex-end;">Open Wizard Dialog</ui5-button>
 					</div>
@@ -103,7 +103,7 @@
 				<ui5-wizard-step title-text="Product Information">
 					<div style="display: flex;flex-direction: column">
 						<ui5-title>2. Product Information</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 
@@ -141,7 +141,7 @@
 					<div style="display: flex; flex-direction: column;">
 						<ui5-title>3. Options</ui5-title><br>
 
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
@@ -181,7 +181,7 @@
 				<ui5-wizard-step title-text="Pricing">
 					<div style="display: flex; flex-direction: column;">
 						<ui5-title>4. Pricing</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
diff --git a/packages/fiori/test/pages/Wizard.html b/packages/fiori/test/pages/Wizard.html
index 0e8488eb89ec..791d6efd590a 100644
--- a/packages/fiori/test/pages/Wizard.html
+++ b/packages/fiori/test/pages/Wizard.html
@@ -40,7 +40,7 @@ <h2>Wizard</h2>
 					The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 				</ui5-messagestrip><br>
 
-				<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+				<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 				</ui5-label>
 				<ui5-button id="btnOpenDialog" style="width: 150px; align-self: flex-end;">Open Wizard Dialog</ui5-button>
 			</div>
@@ -51,7 +51,7 @@ <h2>Wizard</h2>
 		<ui5-wizard-step title-text="Product Information" subtitle-text="(Optional)" disabled>
 			<div style="display: flex;flex-direction: column">
 				<ui5-title>2. Product Information</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -89,7 +89,7 @@ <h2>Wizard</h2>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>3. Options</ui5-title><br>
 
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -129,7 +129,7 @@ <h2>Wizard</h2>
 		<ui5-wizard-step title-text="Pricing" selected>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>4. Pricing</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -168,7 +168,7 @@ <h2>Wizard non-standard</h2>
 					The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 				</ui5-messagestrip><br>
 
-				<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+				<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 				</ui5-label>
 				<ui5-button style="width: 150px; align-self: flex-end;">Open Wizard Dialog</ui5-button>
 			</div>
@@ -177,7 +177,7 @@ <h2>Wizard non-standard</h2>
 		<ui5-wizard-step title-text="Product Information" subtitle-text="(Optional)" disabled>
 			<div style="display: flex;flex-direction: column">
 				<ui5-title>2. Product Information</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -214,7 +214,7 @@ <h2>Wizard non-standard</h2>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>3. Options</ui5-title><br>
 
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -254,7 +254,7 @@ <h2>Wizard non-standard</h2>
 		<ui5-wizard-step title-text="Pricing" disabled>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>4. Pricing</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -284,7 +284,7 @@ <h2>Wizard non-standard</h2>
 		<ui5-wizard-step title-text="Final" selected disabled>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>5. Final</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -322,7 +322,7 @@ <h2>Wizard non-standard 2</h2>
 					The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 				</ui5-messagestrip><br>
 
-				<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+				<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 				</ui5-label>
 				<ui5-button style="width: 150px; align-self: flex-end;">Open Wizard Dialog</ui5-button>
 			</div>
@@ -331,7 +331,7 @@ <h2>Wizard non-standard 2</h2>
 		<ui5-wizard-step title-text="Product Information" subtitle-text="(Optional)" selected disabled>
 			<div style="display: flex;flex-direction: column">
 				<ui5-title>2. Product Information</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -369,7 +369,7 @@ <h2>Wizard non-standard 2</h2>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>3. Options</ui5-title><br>
 
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -406,7 +406,7 @@ <h2>Wizard non-standard 2</h2>
 		<ui5-wizard-step title-text="Pricing" selected disabled>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>4. Pricing</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 				<ui5-messagestrip>
@@ -444,7 +444,7 @@ <h2>Wizard non-standard 3</h2>
 					The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 				</ui5-messagestrip><br>
 
-				<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+				<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 				</ui5-label>
 			</div>
 		</ui5-wizard-step>
@@ -452,7 +452,7 @@ <h2>Wizard non-standard 3</h2>
 		<ui5-wizard-step title-text="Product Information" subtitle-text="(Optional)" selected>
 			<div style="display: flex;flex-direction: column">
 				<ui5-title>2. Product Information</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -490,7 +490,7 @@ <h2>Wizard non-standard 3</h2>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>3. Options</ui5-title><br>
 
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -527,7 +527,7 @@ <h2>Wizard non-standard 3</h2>
 		<ui5-wizard-step title-text="Pricing" selected disabled>
 			<div style="display: flex; flex-direction: column;">
 				<ui5-title>4. Pricing</ui5-title><br>
-				<ui5-label wrap>
+				<ui5-label wrapping-type="Normal">
 					Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 				</ui5-label>
 
@@ -562,7 +562,7 @@ <h2>Wizard non-standard 3</h2>
 						The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 					</ui5-messagestrip><br>
 
-					<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+					<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 					</ui5-label>
 				</div>
 
@@ -572,7 +572,7 @@ <h2>Wizard non-standard 3</h2>
 			<ui5-wizard-step title-text="Product Information" selected>
 				<div style="display: flex;flex-direction: column">
 					<ui5-title>2. Product Information</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 
@@ -610,7 +610,7 @@ <h2>Wizard non-standard 3</h2>
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>3. Options</ui5-title><br>
 
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
@@ -650,7 +650,7 @@ <h2>Wizard non-standard 3</h2>
 			<ui5-wizard-step title-text="Pricing" disabled>
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>4. Pricing</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
diff --git a/packages/fiori/test/pages/Wizard_test.html b/packages/fiori/test/pages/Wizard_test.html
index 9104ddef1d08..3f6f772d7200 100644
--- a/packages/fiori/test/pages/Wizard_test.html
+++ b/packages/fiori/test/pages/Wizard_test.html
@@ -38,7 +38,7 @@
 						The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 					</ui5-messagestrip><br>
 
-					<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+					<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 					</ui5-label>
 
 					<ui5-input id="inpStepChangeCounter"></ui5-input>
@@ -61,7 +61,7 @@
 			<ui5-wizard-step  id="st2" title-text="Product Information" disabled>
 				<div style="display: flex;flex-direction: column">
 					<ui5-title>2. Product Information</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 
@@ -105,7 +105,7 @@
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>3. Options</ui5-title><br>
 
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
@@ -148,7 +148,7 @@
 			<ui5-wizard-step  id="st4" title-text="Pricing" disabled>
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>4. Pricing</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
@@ -187,7 +187,7 @@
 								The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 							</ui5-messagestrip><br>
 
-							<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+							<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 							</ui5-label>
 
 							<ui5-input></ui5-input>
@@ -199,7 +199,7 @@
 					<ui5-wizard-step title-text="Product Information">
 						<div style="display: flex;flex-direction: column">
 							<ui5-title>2. Product Information</ui5-title><br>
-							<ui5-label wrap>
+							<ui5-label wrapping-type="Normal">
 								Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 							</ui5-label>
 
@@ -241,7 +241,7 @@
 						<div style="display: flex; flex-direction: column;">
 							<ui5-title>3. Options</ui5-title><br>
 
-							<ui5-label wrap>
+							<ui5-label wrapping-type="Normal">
 								Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 							</ui5-label>
 							<ui5-messagestrip>
@@ -281,7 +281,7 @@
 					<ui5-wizard-step title-text="Pricing">
 						<div style="display: flex; flex-direction: column;">
 							<ui5-title>4. Pricing</ui5-title><br>
-							<ui5-label wrap>
+							<ui5-label wrapping-type="Normal">
 								Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 							</ui5-label>
 							<ui5-messagestrip>
diff --git a/packages/fiori/test/pages/Wizard_test_mobile.html b/packages/fiori/test/pages/Wizard_test_mobile.html
index aac646f453fa..6b2165d43e23 100644
--- a/packages/fiori/test/pages/Wizard_test_mobile.html
+++ b/packages/fiori/test/pages/Wizard_test_mobile.html
@@ -41,7 +41,7 @@
 				<ui5-wizard-step title-text="Product Information">
 					<div style="display: flex;flex-direction: column">
 						<ui5-title>2. Product Information</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 					</div>
@@ -49,7 +49,7 @@
 	
 				<ui5-wizard-step title-text="Options">
 						<ui5-title>3. Options</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
@@ -59,7 +59,7 @@
 	
 				<ui5-wizard-step title-text="Pricing" selected>
 						<ui5-title>4. Pricing</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
@@ -81,7 +81,7 @@
 				<ui5-wizard-step title-text="Product Information" disabled>
 					<div style="display: flex;flex-direction: column">
 						<ui5-title>2. Product Information</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 					</div>
@@ -89,7 +89,7 @@
 	
 				<ui5-wizard-step title-text="Options" disabled>
 						<ui5-title>3. Options</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
@@ -99,7 +99,7 @@
 	
 				<ui5-wizard-step title-text="Pricing" selected>
 						<ui5-title>4. Pricing</ui5-title><br>
-						<ui5-label wrap>
+						<ui5-label wrapping-type="Normal">
 							Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 						</ui5-label>
 						<ui5-messagestrip>
diff --git a/packages/fiori/test/samples/Wizard.sample.html b/packages/fiori/test/samples/Wizard.sample.html
index d655b2e858db..6642419eddaa 100644
--- a/packages/fiori/test/samples/Wizard.sample.html
+++ b/packages/fiori/test/samples/Wizard.sample.html
@@ -35,7 +35,7 @@ <h3>Wizard</h3>
 						The Wizard control is supposed to break down large tasks, into smaller steps, easier for the user to work with.
 					</ui5-messagestrip><br>
 
-					<ui5-label wrap>Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
+					<ui5-label wrapping-type="Normal">Sed fermentum, mi et tristique ullamcorper, sapien sapien faucibus sem, quis pretium nibh lorem malesuada diam. Nulla quis arcu aliquet, feugiat massa semper, volutpat diam. Nam vitae ante posuere, molestie neque sit amet, dapibus velit. Maecenas eleifend tempor lorem. Mauris vitae elementum mi, sed eleifend ligula. Nulla tempor vulputate dolor, nec dignissim quam convallis ut. Praesent vitae commodo felis, ut iaculis felis. Fusce quis eleifend sapien, eget facilisis nibh. Suspendisse est velit, scelerisque ut commodo eget, dignissim quis metus. Cras faucibus consequat gravida. Curabitur vitae quam felis. Phasellus ac leo eleifend, commodo tortor et, varius quam. Aliquam erat volutpat.
 					</ui5-label>
 				</div>
 
@@ -45,7 +45,7 @@ <h3>Wizard</h3>
 			<ui5-wizard-step icon="hint" title-text="Product Information" disabled>
 				<div style="display: flex;flex-direction: column">
 					<ui5-title>2. Product Information</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 
@@ -83,7 +83,7 @@ <h3>Wizard</h3>
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>3. Options</ui5-title><br>
 
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
@@ -123,7 +123,7 @@ <h3>Wizard</h3>
 			<ui5-wizard-step icon="lead" title-text="Pricing" disabled>
 				<div style="display: flex; flex-direction: column;">
 					<ui5-title>4. Pricing</ui5-title><br>
-					<ui5-label wrap>
+					<ui5-label wrapping-type="Normal">
 						Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec ppellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien corper eu, posuere malesuada nisl. Integer pellentesque leo sit amet dui vehicula, quis ullamcorper est pulvinar. Nam in libero sem. Suspendisse arcu metus, molestie a turpis a, molestie aliquet dui. Donec pulvinar, sapien
 					</ui5-label>
 					<ui5-messagestrip>
diff --git a/packages/main/src/CheckBox.hbs b/packages/main/src/CheckBox.hbs
index 6e0ef72ed754..2a74015f58be 100644
--- a/packages/main/src/CheckBox.hbs
+++ b/packages/main/src/CheckBox.hbs
@@ -30,7 +30,7 @@
 		</div>
 
 		{{#if _label.text}}
-			<ui5-label id="{{_id}}-label" class="ui5-checkbox-label" ?wrap="{{_label.wrap}}">{{_label.text}}</ui5-label>
+			<ui5-label id="{{_id}}-label" class="ui5-checkbox-label" wrapping-type="{{_label.wrappingType}}">{{_label.text}}</ui5-label>
 		{{/if}}
 
 		{{#if hasValueState}}
diff --git a/packages/main/src/CheckBox.js b/packages/main/src/CheckBox.js
index b2af88428b73..71459a3a8946 100644
--- a/packages/main/src/CheckBox.js
+++ b/packages/main/src/CheckBox.js
@@ -9,6 +9,7 @@ import { isSpace, isEnter } from "@ui5/webcomponents-base/dist/Keys.js";
 import "@ui5/webcomponents-icons/dist/accept.js";
 import Icon from "./Icon.js";
 import Label from "./Label.js";
+import WrappingType from "./types/WrappingType.js";
 import {
 	VALUE_STATE_ERROR,
 	VALUE_STATE_WARNING,
@@ -290,7 +291,9 @@ class CheckBox extends UI5Element {
 	syncLabel() {
 		this._label = { ...this._label };
 		this._label.text = this.text;
-		this._label.wrap = this.wrap;
+		/* temporary workaround. remove after all wrap properties in the relevant components are renamed to wrappingType */
+		this._label.wrappingType = this.wrap ? WrappingType.Normal : WrappingType.None;
+		/* end */
 		this._label.textDirection = this.textDirection;
 	}
 
diff --git a/packages/main/src/Label.js b/packages/main/src/Label.js
index f2ce3d27d2db..e7fd69ed6c41 100644
--- a/packages/main/src/Label.js
+++ b/packages/main/src/Label.js
@@ -1,6 +1,7 @@
 import UI5Element from "@ui5/webcomponents-base/dist/UI5Element.js";
 import litRender from "@ui5/webcomponents-base/dist/renderer/LitRenderer.js";
 import { isSafari } from "@ui5/webcomponents-base/dist/Device.js";
+import WrappingType from "./types/WrappingType.js";
 
 // Template
 import LabelTemplate from "./generated/templates/LabelTemplate.lit.js";
@@ -29,16 +30,20 @@ const metadata = {
 		},
 
 		/**
-		 * Determines whether the component should wrap, when there is not enough space.
-		 * <br><br>
-		 * <b>Note:</b> By default the text would truncate.
+		 * Defines how the text of a component will be displayed when there is not enough space.
+		 * Available options are:
+		 * <ul>
+		 * <li><code>None</code> - The text will be truncated with an ellipsis.</li>
+		 * <li><code>Normal</code> - The text will wrap. The words will not be broken based on hyphenation.</li>
+		 * </ul>
 		 *
-		 * @type {boolean}
-		 * @defaultvalue false
+		 * @type {WrappingType}
+		 * @defaultvalue "None"
 		 * @public
 		 */
-		wrap: {
-			type: Boolean,
+		 wrappingType: {
+			type: WrappingType,
+			defaultValue: WrappingType.None,
 		},
 
 		/**
@@ -93,7 +98,7 @@ const metadata = {
  * It informs the user about what data is displayed or expected in the value holder.
  * <br><br>
  * The <code>ui5-label</code> appearance can be influenced by properties,
- * such as <code>required</code> and <code>wrap</code>.
+ * such as <code>required</code> and <code>wrappingType</code>.
  * The appearance of the Label can be configured in a limited way by using the design property.
  * For a broader choice of designs, you can use custom styles.
  *
diff --git a/packages/main/src/RadioButton.hbs b/packages/main/src/RadioButton.hbs
index 3da72fe4e774..40dc6996a818 100644
--- a/packages/main/src/RadioButton.hbs
+++ b/packages/main/src/RadioButton.hbs
@@ -21,7 +21,7 @@
 	</div>
 
 	{{#if text}}
-		<ui5-label id="{{_id}}-label" class="ui5-radio-label" for="{{_id}}" ?wrap="{{wrap}}">{{text}}</ui5-label>
+		<ui5-label id="{{_id}}-label" class="ui5-radio-label" for="{{_id}}" wrapping-type="{{_wrappingType}}">{{text}}</ui5-label>
 	{{/if}}
 
 	{{#if hasValueState}}
diff --git a/packages/main/src/RadioButton.js b/packages/main/src/RadioButton.js
index fe794ebf3b68..0ba89b50e638 100644
--- a/packages/main/src/RadioButton.js
+++ b/packages/main/src/RadioButton.js
@@ -13,6 +13,7 @@ import {
 	isRight,
 } from "@ui5/webcomponents-base/dist/Keys.js";
 import Label from "./Label.js";
+import WrappingType from "./types/WrappingType.js";
 import RadioButtonGroup from "./RadioButtonGroup.js";
 
 // Template
@@ -258,6 +259,11 @@ class RadioButton extends UI5Element {
 
 	onBeforeRendering() {
 		this.syncGroup();
+
+		/* temporary workaround. remove after all wrap properties in the relevant components are renamed to wrappingType */
+		this._wrappingType = this.wrap ? WrappingType.Normal : WrappingType.None;
+		/* end */
+
 		this._enableFormSupport();
 	}
 
diff --git a/packages/main/src/themes/Label.css b/packages/main/src/themes/Label.css
index c5ced4161865..61e4099148bb 100644
--- a/packages/main/src/themes/Label.css
+++ b/packages/main/src/themes/Label.css
@@ -15,7 +15,7 @@
 	width: 100%;
 }
 
-:host(:not([wrap])) .ui5-label-root {
+:host(:not([wrapping-type="Normal"])) .ui5-label-root {
 	font-weight: inherit;
 	display: inline-block;
 	white-space: nowrap;
@@ -28,7 +28,7 @@ bdi {
 	padding-right: 0.15625rem;
 }
 
-:host(:not([wrap])) .ui5-label-text-wrapper {
+:host(:not([wrapping-type="Normal"])) .ui5-label-text-wrapper {
 	text-overflow: ellipsis;
 	overflow: hidden;
 	display: inline-block;
@@ -36,20 +36,20 @@ bdi {
 	max-width: 100%;
 }
 
-:host(:not([wrap])[required][show-colon]) .ui5-label-text-wrapper,
-:host(:not([wrap])[required][show-colon]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
+:host(:not([wrapping-type="Normal"])[required][show-colon]) .ui5-label-text-wrapper,
+:host(:not([wrapping-type="Normal"])[required][show-colon]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
 	max-width: calc(100% - .8rem);
 }
 
-:host(:not([wrap])[required]) .ui5-label-text-wrapper {
+:host(:not([wrapping-type="Normal"])[required]) .ui5-label-text-wrapper {
 	max-width: calc(100% - .475rem);
 }
 
-:host(:not([wrap])[required]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
+:host(:not([wrapping-type="Normal"])[required]) .ui5-label-text-wrapper.ui5-label-text-wrapper-safari {
 	max-width: calc(100% - .425rem);
 }
 
-:host(:not([wrap])[show-colon]) .ui5-label-text-wrapper {
+:host(:not([wrapping-type="Normal"])[show-colon]) .ui5-label-text-wrapper {
 	max-width: calc(100% - .2rem);
 }
 
diff --git a/packages/main/test/pages/Kitchen.html b/packages/main/test/pages/Kitchen.html
index d4b9302dc3ed..d964737727dd 100644
--- a/packages/main/test/pages/Kitchen.html
+++ b/packages/main/test/pages/Kitchen.html
@@ -638,7 +638,7 @@
 
 		<section class="row row-centered">
 			<ui5-label>This is a long long even longer text defined via the ui5-label and it truncates by default</ui5-label>
-			<ui5-label wrap>This is a long long even longer text defined via the ui5-label, but this one wraps</ui5-label>
+			<ui5-label wrapping-type="Normal">This is a long long even longer text defined via the ui5-label, but this one wraps</ui5-label>
 		</section>
 	</div>
 	<script src="./kitchen-scripts.js"></script>
diff --git a/packages/main/test/pages/Kitchen.openui5.html b/packages/main/test/pages/Kitchen.openui5.html
index ea040b36c669..b0ffac29eabe 100644
--- a/packages/main/test/pages/Kitchen.openui5.html
+++ b/packages/main/test/pages/Kitchen.openui5.html
@@ -561,7 +561,7 @@
 
 		<section class="row row-centered">
 			<ui5-label>This is a long long even longer text defined via the ui5-label and it truncates by default</ui5-label>
-			<ui5-label wrap>This is a long long even longer text defined via the ui5-label, but this one wraps</ui5-label>
+			<ui5-label wrapping-type="Normal">This is a long long even longer text defined via the ui5-label, but this one wraps</ui5-label>
 		</section>
 	</div>
 	<script src="./kitchen-scripts.js"></script>
diff --git a/packages/main/test/pages/Label.html b/packages/main/test/pages/Label.html
index f0307525003d..ce18e9f785fa 100644
--- a/packages/main/test/pages/Label.html
+++ b/packages/main/test/pages/Label.html
@@ -58,21 +58,21 @@ <h2>Basic long labels  with predefined width</h2>
 		<h2>Required labels</h2>
 		<ui5-label id="required-label" required>Required</ui5-label><span>native span</span>
 		<ui5-label id="required-label-2" required show-colon>Required semi-colon</ui5-label><span>native span</span>
-		<ui5-label id="required-label-3" required show-colon wrap>Required semi-colon wrapped</ui5-label><span>native span</span>
+		<ui5-label id="required-label-3" required show-colon wrapping-type="Normal">Required semi-colon wrapped</ui5-label><span>native span</span>
 	</section>
 
 	<section class="group">
 		<h2>Wrapping label</h2>
 		<ui5-label style="width: 200px" id="wrapping-label-1">Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
 		<ui5-label style="width: 200px" id="wrapping-label-2" show-colon>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur</ui5-label>
-		<ui5-label style="width: 200px" id="wrapping-label" wrap>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
-		<ui5-label style="width: 200px" id="wrapping-label-3" wrap required>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
+		<ui5-label style="width: 200px" id="wrapping-label" wrapping-type="Normal">Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
+		<ui5-label style="width: 200px" id="wrapping-label-3" wrapping-type="Normal" required>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
 		<ui5-label style="width: 100px" id="truncated-label" required >Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
 		<ui5-label style="width: 100px" id="truncated-label-2" show-colon required >Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
-		<ui5-label style="width: 100px" id="truncated-label-3" show-colon required wrap >Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
+		<ui5-label style="width: 100px" id="truncated-label-3" show-colon required wrapping-type="Normal">Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur.</ui5-label>
 
 		<div>
-			<ui5-label style="width: 500px; text-align: right;" id="wrapping-label-4" wrap>Must be right-aligned using `text-align: right` and wrap.</ui5-label>
+			<ui5-label style="width: 600px; text-align: right;" id="wrapping-label-4" wrapping-type="Normal">Must be right-aligned using `text-align: right` and wrapping-type="Normal".</ui5-label>
 		</div>
 	</section>
 	
@@ -90,7 +90,7 @@ <h2>label + input</h2>
 		<br>
 
 		<div style="display: flex; align-items: center">
-			<ui5-label id="label-for-native-input" for="native-input" style="width: 100px" show-colon wrap required>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur</ui5-label>
+			<ui5-label id="label-for-native-input" for="native-input" style="width: 100px" show-colon wrapping-type="Normal" required>Reprehenderit amet cillum tempor ex eu dolor adipisicing reprehenderit pariatur</ui5-label>
 			<input style="width: 320px; margin: 0 16px;" id="native-input"></input>
 		</div>
 
diff --git a/packages/main/test/pages/Panel.html b/packages/main/test/pages/Panel.html
index b748edfdcce8..3401058c8a42 100644
--- a/packages/main/test/pages/Panel.html
+++ b/packages/main/test/pages/Panel.html
@@ -72,7 +72,7 @@
 		<!-- Content -->
 		This is my panel <!-- fafa --> <br>
 		<ui5-title id="p1-content1">Lorem ipsum!</ui5-title>
-		<ui5-label id="p1-content2" wrap>
+		<ui5-label id="p1-content2" wrapping-type="Normal">
 			<span>
 			Lorem ipsum dolor sit amet, tamquam invidunt cu sed, unum regione mel ea, quo ea alia novum. Ne qui illud zril
 			nostrum, vel ea sint dicant postea. Vel ne facete tritani, neglegentur concludaturque sed te. His animal dolorum ut.
@@ -102,7 +102,7 @@
 
 		<!-- Content -->
 		<ui5-title>Lorem ipsum!</ui5-title>
-		<ui5-label wrap>
+		<ui5-label wrapping-type="Normal">
 			<span>
 			Lorem ipsum dolor sit amet, tamquam invidunt cu sed, unum regione mel ea, quo ea alia novum. Ne qui illud zril
 			nostrum, vel ea sint dicant postea. Vel ne facete tritani, neglegentur concludaturque sed te. His animal dolorum ut.
@@ -132,7 +132,7 @@
 		<!-- Content -->
 		<ui5-title>Lorem ipsum!</ui5-title>
 		<br>
-		<ui5-label wrap>
+		<ui5-label wrapping-type="Normal">
 			Some short text.
 		</ui5-label>
 
@@ -145,7 +145,7 @@
 		<!-- Content -->
 		<ui5-title>Lorem ipsum!</ui5-title>
 		<br>
-		<ui5-label wrap>
+		<ui5-label wrapping-type="Normal">
 			Some short text.
 		</ui5-label>
 
@@ -158,7 +158,7 @@
 		<!-- Content -->
 		<ui5-title>This is a demo how to use the &quot;expand&quot; event.</ui5-title>
 		<br>
-		<ui5-label wrap>
+		<ui5-label wrapping-type="Normal">
 			Some short text.
 		</ui5-label>
 
@@ -174,7 +174,7 @@
 		<!-- Content -->
 		<ui5-title>This is a demo how to use the &quot;expand&quot; event.</ui5-title>
 		<br>
-		<ui5-label wrap>
+		<ui5-label wrapping-type="Normal">
 			Some short text.
 		</ui5-label>
 	</ui5-panel>
diff --git a/packages/main/test/samples/Label.sample.html b/packages/main/test/samples/Label.sample.html
index f0bc00a3ba5c..8271d82ac157 100644
--- a/packages/main/test/samples/Label.sample.html
+++ b/packages/main/test/samples/Label.sample.html
@@ -49,10 +49,10 @@ <h3>Truncated Label</h3>
 <section>
 	<h3>Wrapped Label</h3>
 	<div class="snippet">
-		<ui5-label style="width:200px" wrap>Long labels can wrap if the 'wrap' property is set.</ui5-label>
+		<ui5-label style="width:200px" wrapping-type="Normal">Long labels can wrap if the 'wrapping-type="Normal"' property is set.</ui5-label>
 	</div>
 	<pre class="prettyprint lang-html"><xmp>
-<ui5-label style="width:200px" wrap>Long labels can wrap if the 'wrap' property is set.</ui5-label>
+<ui5-label style="width:200px" wrapping-type="Normal">Long labels can wrap if the 'wrapping-type="Normal"' property is set.</ui5-label>
 	</xmp></pre>
 </section>
 
diff --git a/packages/main/test/samples/Panel.sample.html b/packages/main/test/samples/Panel.sample.html
index ee86fb8b09ae..ca902aba0b81 100644
--- a/packages/main/test/samples/Panel.sample.html
+++ b/packages/main/test/samples/Panel.sample.html
@@ -25,9 +25,9 @@ <h3>Basic Panel</h3>
 		<ui5-panel width="100%" accessible-role="Complementary"
 			header-text="Both expandable and expanded" class="full-width">
 			<h1 class="content-color">I am a native heading!</h1>
-			<ui5-label wrap>Short text.</ui5-label>
+			<ui5-label wrapping-type="Normal">Short text.</ui5-label>
 			<br>
-			<ui5-label wrap>Another text.</ui5-label>
+			<ui5-label wrapping-type="Normal">Another text.</ui5-label>
 			<p class="content-color">
 				Aute ullamco officia fugiat culpa do tempor tempor aute excepteur magna. Quis velit adipisicing excepteur do eu duis elit. Sunt ea pariatur nulla est laborum proident sunt labore commodo Lorem laboris nisi Lorem.
 			</p>
@@ -37,9 +37,9 @@ <h1 class="content-color">I am a native heading!</h1>
 <ui5-panel width="100%" accessible-role="Complementary"
 	header-text="Both expandable and expanded" class="full-width">
 	<h1 class="content-color">I am a native heading!</h1>
-	<ui5-label wrap>Short text.</ui5-label>
+	<ui5-label wrapping-type="Normal">Short text.</ui5-label>
 	<br>
-	<ui5-label wrap>Another text.</ui5-label>
+	<ui5-label wrapping-type="Normal">Another text.</ui5-label>
 	<p class="content-color">
 		Aute ullamco officia fugiat culpa do tempor tempor aute excepteur magna. Quis velit adipisicing excepteur do eu duis elit. Sunt ea pariatur nulla est laborum proident sunt labore commodo Lorem laboris nisi Lorem.
 	</p>
diff --git a/packages/main/test/specs/Components.spec.js b/packages/main/test/specs/Components.spec.js
index 48090ecb8950..fd9c6108ce32 100644
--- a/packages/main/test/specs/Components.spec.js
+++ b/packages/main/test/specs/Components.spec.js
@@ -43,7 +43,6 @@ describe("General assertions", () => {
 		assertBooleanProperty(dialog, "stretch");
 
 		//  Label
-		assertBooleanProperty(label, "wrap");
 		assertBooleanProperty(label, "required");
 
 		//Link