From cba42a1f27e52e9d416ba1d37aeb1f82e5a17a17 Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Wed, 21 Feb 2018 09:45:50 +0100
Subject: [PATCH 1/2] CRQ-8774 replace amp symbol with encoded entity

---
 .../webapp/tridion/mapping/AbstractDefaultContentProvider.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java b/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java
index 9ec484d8e..e9a220ec9 100644
--- a/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java
+++ b/dxa-framework/dxa-tridion-provider/src/main/java/com/sdl/webapp/tridion/mapping/AbstractDefaultContentProvider.java
@@ -347,7 +347,7 @@ protected String prependFullUrlIfNeeded(String path) {
         if (path.contains(baseUrl)) {
             return path;
         }
-        return UriUtils.encodePath(baseUrl + path, "UTF-8");
+        return UriUtils.encodePath(baseUrl + path, "UTF-8").replace("&", "%26");
     }
 
     private StaticContentFile getStaticContentFile(String path, String localizationId)

From 896ec935e7e99721d2e4dfd7795f4048fc59d8ca Mon Sep 17 00:00:00 2001
From: Alexey Zarakovskiy <azarakovskiy@sdl.com>
Date: Mon, 26 Feb 2018 10:54:11 +0100
Subject: [PATCH 2/2] dxa-tridion-provider 1.7.1 version

---
 dxa-framework/dxa-tridion-provider/pom.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/dxa-framework/dxa-tridion-provider/pom.xml b/dxa-framework/dxa-tridion-provider/pom.xml
index d435ff051..a399024b7 100644
--- a/dxa-framework/dxa-tridion-provider/pom.xml
+++ b/dxa-framework/dxa-tridion-provider/pom.xml
@@ -10,6 +10,7 @@
     </parent>
 
     <artifactId>dxa-tridion-provider</artifactId>
+	<version>1.7.1</version>
 
     <name>DXA - Tridion provider</name>
     <description>DXA Providers version-independent functionality</description>