diff --git a/README.md b/README.md
index 9cd0aea1..8cc71dba 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,6 @@ More features will be added over time.
 The following is a list of features to be added in the future:
 
 * In-store pickup.
-* Package and bundle support.
 * Multi-payment support.
 
 Installation
diff --git a/Sources/AssemblyVersionAuto.cs b/Sources/AssemblyVersionAuto.cs
index fb9557f4..9e0bc88d 100644
--- a/Sources/AssemblyVersionAuto.cs
+++ b/Sources/AssemblyVersionAuto.cs
@@ -2,6 +2,6 @@
 
 
 
-[assembly: AssemblyVersion("10.4.1.0")]
-[assembly: AssemblyInformationalVersion("10.4.1")]
-[assembly: AssemblyFileVersion("10.4.1.2266")]
+[assembly: AssemblyVersion("10.4.2.0")]
+[assembly: AssemblyInformationalVersion("10.4.2")]
+[assembly: AssemblyFileVersion("10.4.2.2273")]
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
index ba9e869b..b0c77b9f 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Manager/EPiServer.Reference.Commerce.Manager.csproj
@@ -33,8 +33,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <UseVSHostingProcess>true</UseVSHostingProcess>
-    <LangVersion>5</LangVersion>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -44,6 +43,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AuthorizeNet, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
@@ -431,109 +431,109 @@
   </Target>
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.ConsoleManager, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.1\lib\net45\Mediachase.ConsoleManager.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\Mediachase.ConsoleManager.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ComponentArt.Web.UI, Version=2012.1.1016.35, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.1\lib\net45\ComponentArt.Web.UI.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\ComponentArt.Web.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nsoftware.IBizPay, Version=4.1.3575.0, Culture=neutral, PublicKeyToken=cdc168f89cffe9cf, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\nsoftware.IBizPay.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="RssToolkit, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.1\lib\net45\RssToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\RssToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Validators, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.1\lib\net45\Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.CommerceManager.10.4.2\lib\net45\Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
-  <Import Project="..\..\packages\EPiServer.CommerceManager.10.4.1\build\EPiServer.CommerceManager.targets"
-    Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.4.1\build\EPiServer.CommerceManager.targets')"/>
+  <Import Project="..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets"
+    Condition="Exists('..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets')"/>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.10.4.1\build\EPiServer.CommerceManager.targets')"
-      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.4.1\build\EPiServer.CommerceManager.targets'))"/>
+    <Error Condition="!Exists('..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets')"
+      Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\EPiServer.CommerceManager.10.4.2\build\EPiServer.CommerceManager.targets'))"/>
   </Target>
 </Project>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/packages.config b/Sources/EPiServer.Reference.Commerce.Manager/packages.config
index 360a6fa1..611844d9 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Manager/packages.config
@@ -32,6 +32,6 @@
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
   <package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net452" />
   <package id="structuremap-signed" version="3.1.9.463" targetFramework="net452" />
-  <package id="EPiServer.Commerce.Core" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.CommerceManager" version="10.4.1" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.Core" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.CommerceManager" version="10.4.2" targetFramework="net452"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Manager/web.config b/Sources/EPiServer.Reference.Commerce.Manager/web.config
index a9b794ce..8720bb24 100644
--- a/Sources/EPiServer.Reference.Commerce.Manager/web.config
+++ b/Sources/EPiServer.Reference.Commerce.Manager/web.config
@@ -550,75 +550,75 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.ConsoleManager" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
index ad250a54..ff213052 100644
--- a/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Shared/EPiServer.Reference.Commerce.Shared.csproj
@@ -22,7 +22,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>5</LangVersion>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -32,6 +32,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CA|AnyCPU'">
     <OutputPath>bin\CA\</OutputPath>
@@ -289,83 +290,83 @@
   -->
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nsoftware.IBizPay, Version=4.1.3575.0, Culture=neutral, PublicKeyToken=cdc168f89cffe9cf, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\nsoftware.IBizPay.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Shared/packages.config b/Sources/EPiServer.Reference.Commerce.Shared/packages.config
index c2b0eba4..e201293d 100644
--- a/Sources/EPiServer.Reference.Commerce.Shared/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Shared/packages.config
@@ -30,5 +30,5 @@
   <package id="SharpZipLib" version="0.86.0" targetFramework="net452" />
   <package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net452" />
   <package id="structuremap-signed" version="3.1.9.463" targetFramework="net452" />
-  <package id="EPiServer.Commerce.Core" version="10.4.1" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.Core" version="10.4.2" targetFramework="net452"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
index b1c341f4..57b2ea91 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/EPiServer.Reference.Commerce.Site.Tests.csproj
@@ -30,7 +30,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <LangVersion>5</LangVersion>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -40,6 +40,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CA|AnyCPU'">
     <OutputPath>bin\CA\</OutputPath>
@@ -410,91 +411,91 @@
   -->
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Recommendations, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Recommendations.1.0.6\lib\net45\EPiServer.Recommendations.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Recommendations.1.1.0\lib\net45\EPiServer.Recommendations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Recommendations.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Recommendations.Commerce.10.4.1\lib\net45\EPiServer.Recommendations.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Recommendations.Commerce.10.4.2\lib\net45\EPiServer.Recommendations.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nsoftware.IBizPay, Version=4.1.3575.0, Culture=neutral, PublicKeyToken=cdc168f89cffe9cf, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\nsoftware.IBizPay.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/CategoryControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/CategoryControllerTests.cs
index 1c2bdda9..35b0a0b7 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/CategoryControllerTests.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/CategoryControllerTests.cs
@@ -60,10 +60,35 @@ public void Index_WhenPassingFormModel_ShouldPassItOnToFactory()
             // Assert
             _viewModelFactoryMock.Verify(v => v.Create(It.IsAny<FashionNode>(), formModel));
         }
-        
+
+        [Fact]
+        public void Facet_WhenBrowsingFirstResultPage_ShouldSendFacetTracking()
+        {
+            _subject.Facet(null, new FilterOptionViewModel() {SelectedFacet = "key:value",  Page = 1 });
+            _recommendationServiceMock.Verify(
+               x => x.SendFacetTrackingData(
+                       It.IsAny<HttpContextBase>(),
+                       It.IsAny<string>()
+                       ),
+               Times.Once);
+        }
+
+        [Fact]
+        public void Facet_WhenBrowsingNextResultPage_ShouldNotSendFacetTracking()
+        {
+            _subject.Facet(null, new FilterOptionViewModel() {SelectedFacet = "key:value",  Page = 2 });
+            _recommendationServiceMock.Verify(
+               x => x.SendFacetTrackingData(
+                       It.IsAny<HttpContextBase>(),
+                       It.IsAny<string>()
+                       ),
+               Times.Never);
+        }
+
         private readonly CategoryController _subject;
         private readonly Mock<SearchViewModelFactory> _viewModelFactoryMock;
         private readonly Mock<HttpRequestBase> _httpRequestMock;
+        Mock<IRecommendationService> _recommendationServiceMock;
 
         public CategoryControllerTests()
         {
@@ -72,13 +97,14 @@ public CategoryControllerTests()
                 .Returns(() => new ContentReference(1));
             _viewModelFactoryMock = new Mock<SearchViewModelFactory>(null, null);
             _httpRequestMock = new Mock<HttpRequestBase>();
+            _recommendationServiceMock = new Mock<IRecommendationService>();
 
             var context = new Mock<HttpContextBase>();
             context.SetupGet(x => x.Request).Returns(_httpRequestMock.Object);
             
             _subject = new CategoryController(
-                _viewModelFactoryMock.Object, 
-                Mock.Of<IRecommendationService>(),
+                _viewModelFactoryMock.Object,
+                _recommendationServiceMock.Object,
                 referenceConverterMock.Object);
             _subject.ControllerContext = new ControllerContext(context.Object, new RouteData(), _subject);
         }
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
index 5e2098c7..ab6c929c 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/Features/Search/Controllers/SearchControllerTests.cs
@@ -29,9 +29,9 @@ public void Index_ShouldReturnViewModel()
         }
 
         [Fact]
-        public void Index_ShouldSendSearchTracking()
+        public void Index_WhenBrowsingFirstResultPage_ShouldSendSearchTracking()
         {
-            _subject.Index(new SearchPage(), new FilterOptionViewModel());
+            _subject.Index(new SearchPage(), new FilterOptionViewModel() { Page = 1 });
             _recommendationServiceMock.Verify(
                x => x.SendSearchTracking(
                        It.IsAny<HttpContextBase>(),
@@ -41,6 +41,19 @@ public void Index_ShouldSendSearchTracking()
                Times.Once);
         }
 
+        [Fact]
+        public void Index_WhenBrowsingNextResultPage_ShouldNotSendSearchTracking()
+        {
+            _subject.Index(new SearchPage(), new FilterOptionViewModel() { Page = 2 });
+            _recommendationServiceMock.Verify(
+               x => x.SendSearchTracking(
+                       It.IsAny<HttpContextBase>(),
+                       It.IsAny<string>(),
+                       It.IsAny<IEnumerable<string>>()
+                       ),
+               Times.Never);
+        }
+
         [Fact]
         public void QuickSearch_WhenSearch_ShouldReturnIEnumerableProductViewModel()
         {
diff --git a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
index c47e9a99..76b97398 100644
--- a/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Site.Tests/packages.config
@@ -41,7 +41,7 @@
   <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net452" />
   <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net452" />
   <package id="xunit.runner.visualstudio" version="2.1.0" targetFramework="net452" />
-  <package id="EPiServer.Commerce.Core" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.Recommendations" version="1.0.6" targetFramework="net452"/>
-  <package id="EPiServer.Recommendations.Commerce" version="10.4.1" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.Core" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Recommendations" version="1.1.0" targetFramework="net452"/>
+  <package id="EPiServer.Recommendations.Commerce" version="10.4.2" targetFramework="net452"/>
 </packages>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
index a4f4d34f..cb6d3dbb 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
+++ b/Sources/EPiServer.Reference.Commerce.Site/EPiServer.Reference.Commerce.Site.csproj
@@ -931,16 +931,26 @@
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Daily site|AnyCPU'">
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
     <OutputPath>bin\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <DebugType>full</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
+    <LangVersion>6</LangVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>5</LangVersion>
+    <WarningLevel>4</WarningLevel>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <LangVersion>6</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'CA|AnyCPU'">
     <OutputPath>bin\</OutputPath>
@@ -997,103 +1007,103 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="EPiServer.Business.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Business.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Internal.Migration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\EPiServer.Commerce.Internal.Migration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.BusinessFoundation.Data, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.BusinessFoundation.Data.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Marketing.Validators, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Marketing.Validators.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Payment, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Payment.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Plugins.Shipping, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Plugins.Shipping.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Website, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Website.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Commerce.Workflow, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Commerce.Workflow.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.DataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.DataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.DataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.FileUploader, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.FileUploader.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.FileUploader.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.MetaDataPlus, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.MetaDataPlus.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.Extensions, Culture=neutral, PublicKeyToken=6e58b501b34abce3, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.Extensions.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.Search.LuceneSearchProvider, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.Search.LuceneSearchProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.SqlDataProvider, Culture=neutral, PublicKeyToken=41d2e7a615ba286c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.SqlDataProvider.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Mediachase.WebConsoleLib, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\Mediachase.WebConsoleLib.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Shell, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.10.4.1\lib\net45\EPiServer.Commerce.Shell.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.10.4.2\lib\net45\EPiServer.Commerce.Shell.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.Shell.ManagerIntegration, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.4.1\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.ManagerIntegration.10.4.2\lib\net45\EPiServer.Commerce.Shell.ManagerIntegration.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Commerce.UI, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.UI.10.4.1\lib\net45\EPiServer.Commerce.UI.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.UI.10.4.2\lib\net45\EPiServer.Commerce.UI.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Recommendations, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Recommendations.1.0.6\lib\net45\EPiServer.Recommendations.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Recommendations.1.1.0\lib\net45\EPiServer.Recommendations.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EPiServer.Recommendations.Commerce, Culture=neutral, PublicKeyToken=8fe83dea738b45b7, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Recommendations.Commerce.10.4.1\lib\net45\EPiServer.Recommendations.Commerce.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Recommendations.Commerce.10.4.2\lib\net45\EPiServer.Recommendations.Commerce.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AjaxControlToolkit, Version=3.0.30930.28736, Culture=neutral, PublicKeyToken=28f01b0e84b6d53e, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\AjaxControlToolkit.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\AjaxControlToolkit.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="nsoftware.IBizPay, Version=4.1.3575.0, Culture=neutral, PublicKeyToken=cdc168f89cffe9cf, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.1\lib\net45\nsoftware.IBizPay.dll</HintPath>
+      <HintPath>..\..\packages\EPiServer.Commerce.Core.10.4.2\lib\net45\nsoftware.IBizPay.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
index 723784fb..0623c374 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/CategoryController.cs
@@ -42,7 +42,7 @@ public ViewResult Index(FashionNode currentContent, FilterOptionViewModel viewMo
         [ChildActionOnly]
         public ActionResult Facet(FashionNode currentContent, FilterOptionViewModel viewModel)
         {
-            if (viewModel != null && !string.IsNullOrEmpty(viewModel.SelectedFacet))
+            if (viewModel != null && !string.IsNullOrEmpty(viewModel.SelectedFacet) && viewModel.Page <= 1)
             {
                 _recommendationService.SendFacetTrackingData(HttpContext, viewModel.SelectedFacet);
             }
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
index 3efd0739..e53883b6 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Search/Controllers/SearchController.cs
@@ -35,9 +35,12 @@ public SearchController(
         public ActionResult Index(SearchPage currentPage, FilterOptionViewModel filterOptions)
         {
             var viewModel = _viewModelFactory.Create(currentPage, filterOptions);
-            viewModel.Recommendations = _recommendationService
+            if (filterOptions.Page <= 1)
+            {
+                viewModel.Recommendations = _recommendationService
                 .SendSearchTracking(HttpContext, filterOptions.Q, viewModel.ProductViewModels.Select(x => x.Code))
                 .GetSearchResultRecommendations(_referenceConverter);
+            }
 
             return View(viewModel);
         }
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Features/Shared/Extensions/LineItemExtensions.cs b/Sources/EPiServer.Reference.Commerce.Site/Features/Shared/Extensions/LineItemExtensions.cs
index 17e3163c..22e87be9 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Features/Shared/Extensions/LineItemExtensions.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Features/Shared/Extensions/LineItemExtensions.cs
@@ -5,6 +5,7 @@
 using System;
 using System.Web;
 using EPiServer.Commerce.Order;
+using EPiServer.Core;
 using EPiServer.Reference.Commerce.Site.Features.Cart.ViewModels;
 
 namespace EPiServer.Reference.Commerce.Site.Features.Shared.Extensions
@@ -19,9 +20,7 @@ public static class LineItemExtensions
 
         public static string GetUrl(this ILineItem lineItem)
         {
-            var entryContentLink = _referenceConverter.Service.GetContentLink(lineItem.Code);
-            var entry = _contentLoader.Service.Get<EntryContentBase>(entryContentLink);
-            return entry.GetUrl();
+            return GetEntryContent(lineItem.Code)?.GetUrl();
         }
 
         public static string GetFullUrl(this ILineItem lineItem)
@@ -43,9 +42,22 @@ public static string GetThumbnailUrl(this CartItemViewModel cartItem)
 
         private static string GetThumbnailUrl(string code)
         {
-            var content = _contentLoader.Service.Get<EntryContentBase>(_referenceConverter.Service.GetContentLink(code, CatalogContentType.CatalogEntry));
-
+            var content = GetEntryContent(code);
+            if (content == null)
+            {
+                return string.Empty;
+            }
             return _thumbnailUrlResolver.Service.GetThumbnailUrl(content, "thumbnail");
-        }    
+        }
+
+        private static EntryContentBase GetEntryContent(string code)
+        {
+            var entryContentLink = _referenceConverter.Service.GetContentLink(code);
+            if (ContentReference.IsNullOrEmpty(entryContentLink))
+            {
+                return null;
+            }
+            return _contentLoader.Service.Get<EntryContentBase>(entryContentLink);
+        }
     }
 }
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/SiteInitialization.cs b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/SiteInitialization.cs
index af2dd10c..3aa0ea3b 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/SiteInitialization.cs
+++ b/Sources/EPiServer.Reference.Commerce.Site/Infrastructure/SiteInitialization.cs
@@ -5,6 +5,7 @@
 using EPiServer.Framework.Initialization;
 using EPiServer.Framework.Web;
 using EPiServer.Globalization;
+using EPiServer.Recommendations.Widgets;
 using EPiServer.Reference.Commerce.Site.Features.Market.Services;
 using EPiServer.Reference.Commerce.Site.Infrastructure.Attributes;
 using EPiServer.Reference.Commerce.Site.Infrastructure.Business;
@@ -15,6 +16,9 @@
 using Mediachase.Commerce;
 using Mediachase.Commerce.Core;
 using Newtonsoft.Json;
+using System;
+using System.Linq;
+using System.Text;
 using System.Web;
 using System.Web.Http;
 using System.Web.Mvc;
@@ -43,6 +47,15 @@ public void Initialize(InitializationEngine context)
             DisablePromotionTypes(context);
 
             SetupExcludedPromotionEntries(context);
+
+            //This method creates and activates the default Recommendations widgets.
+            //It only needs to run once, not every initialization, and only if you use the Recommendations feature.
+            //Instructions:
+            //* Enter the configuration values for Recommendations in web.config
+            //* Make sure that the episerver:RecommendationsSilentMode flag is not set to true.
+            //* Uncomment the following line, compile, start site, commment the line again, compile.
+
+            //SetupRecommendationsWidgets(context);
         }
 
         public void ConfigureContainer(ServiceConfigurationContext context)
@@ -112,5 +125,42 @@ private void SetupExcludedPromotionEntries(InitializationEngine context)
             //var ExcludingCodes = new string[] { "SKU-36127195", "SKU-39850363", "SKU-39101253" };
             //filterSettings.AddFilter<EntryContentBase>(x => !ExcludingCodes.Contains(x.Code));
         }
+
+        private void SetupRecommendationsWidgets(InitializationEngine context)
+        {
+            var configuration = context.Locate.Advanced.GetInstance<Recommendations.Configuration>();
+
+            if (configuration.SilentMode)
+            {
+                return;
+            }
+
+            var widgetService = context.Locate.Advanced.GetInstance<WidgetService>();
+            var response = widgetService.CreateWidgets();
+
+            if (response.Status != "OK")
+            {
+                var error = response.Errors.First();
+                var message = new StringBuilder($"Code: {error.Code}, Message: {error.Error}");
+                
+                if (error.Field != null)
+                {
+                    message.Append($", Field: {error.Field}");
+                }
+
+                throw new Exception(message.ToString());
+            }
+
+            foreach (var widget in response.EpiPerPage.Pages.SelectMany(x => x.Widgets))
+            {
+                widget.Active = true;
+                var success = widgetService.UpdateWidget(widget);
+
+                if (!success)
+                {
+                    throw new Exception($"Failed to activate widget {widget.WidgetName}");
+                }
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderHistory/Index.cshtml b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderHistory/Index.cshtml
index b25e8467..92e1364b 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Views/OrderHistory/Index.cshtml
+++ b/Sources/EPiServer.Reference.Commerce.Site/Views/OrderHistory/Index.cshtml
@@ -42,7 +42,7 @@
                         <ul class="list-unstyled">
                             @foreach (var item in order.Items)
                             {
-                                <li><a href="@item.LineItem.GetUrl()" class="link--black"><img src="@item.LineItem.GetThumbnailUrl()" /> @item.LineItem.GetEntryContent().DisplayName</a></li>
+                                <li><a href="@item.LineItem.GetUrl()" class="link--black"><img src="@item.LineItem.GetThumbnailUrl()" /> @item.LineItem.DisplayName</a></li>
                             }
                         </ul>
                     </div>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/Web.config b/Sources/EPiServer.Reference.Commerce.Site/Web.config
index 6b76172d..40d4f568 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/Web.config
+++ b/Sources/EPiServer.Reference.Commerce.Site/Web.config
@@ -240,91 +240,91 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Business.Commerce" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation.Data" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.BusinessFoundation" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Marketing.Validators" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Payment" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Plugins.Shipping" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Website" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Commerce.Workflow" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.DataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.FileUploader" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.MetaDataPlus" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.Extensions" publicKeyToken="6e58b501b34abce3" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.Search.LuceneSearchProvider" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Mediachase.SqlDataProvider" publicKeyToken="41d2e7a615ba286c" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.UI" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Internal.Migration" publicKeyToken="8fe83dea738b45b7" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Shell" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Commerce.Shell.ManagerIntegration" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Recommendations" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-1.0.6.0" newVersion="1.0.6.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-1.1.0.0" newVersion="1.1.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="EPiServer.Recommendations.Commerce" publicKeyToken="null" culture="neutral"/>
-        <bindingRedirect oldVersion="0.0.0.0-10.4.1.0" newVersion="10.4.1.0"/>
+        <bindingRedirect oldVersion="0.0.0.0-10.4.2.0" newVersion="10.4.2.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip
index 8a8b8060..503b1d7f 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/Commerce/Commerce.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip
index b70850ee..65a76c41 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell.ManagerIntegration/EPiServer.Commerce.Shell.ManagerIntegration.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip
index 42e2b508..c7f55cca 100644
Binary files a/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip and b/Sources/EPiServer.Reference.Commerce.Site/modules/_protected/EPiServer.Commerce.Shell/EPiServer.Commerce.Shell.zip differ
diff --git a/Sources/EPiServer.Reference.Commerce.Site/packages.config b/Sources/EPiServer.Reference.Commerce.Site/packages.config
index 9d43d96d..ff271fc3 100644
--- a/Sources/EPiServer.Reference.Commerce.Site/packages.config
+++ b/Sources/EPiServer.Reference.Commerce.Site/packages.config
@@ -50,10 +50,10 @@
   <package id="structuremap.web-signed" version="3.1.6.186" targetFramework="net452" />
   <package id="structuremap-signed" version="3.1.9.463" targetFramework="net452" />
   <package id="WebGrease" version="1.6.0" targetFramework="net45" />
-  <package id="EPiServer.Commerce" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.Commerce.Core" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.Commerce.UI" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.Commerce.UI.ManagerIntegration" version="10.4.1" targetFramework="net452"/>
-  <package id="EPiServer.Recommendations" version="1.0.6" targetFramework="net452"/>
-  <package id="EPiServer.Recommendations.Commerce" version="10.4.1" targetFramework="net452"/>
+  <package id="EPiServer.Commerce" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.Core" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.UI" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Commerce.UI.ManagerIntegration" version="10.4.2" targetFramework="net452"/>
+  <package id="EPiServer.Recommendations" version="1.1.0" targetFramework="net452"/>
+  <package id="EPiServer.Recommendations.Commerce" version="10.4.2" targetFramework="net452"/>
 </packages>