diff --git a/src/System.Waf/Documentation/Changelog.txt b/src/System.Waf/Documentation/Changelog.txt
index 901bffd3..02b08bd7 100644
--- a/src/System.Waf/Documentation/Changelog.txt
+++ b/src/System.Waf/Documentation/Changelog.txt
@@ -1,8 +1,12 @@
 Changelog
 ---------
 
-Version 4.1.0.8 (Milestone 8)
-- WAF: Fix NuGet package creation bat file (nuget parameters were not passed correctly)
+Version 4.1.0.91 (Release Candidate 1)
+- WAF: Add extension method IndexOf for IEnumerable<T>.
+- WAF: Fix NuGet package creation bat file (nuget parameters were not passed correctly).
+- WAF: Fix Dispose enumerator in GetNextElementOrDefault.
+- WAF: Support null in BoolToVisibilityConverter and InvertBooleanConverter.
+- WAF: UWP IsVisible needs to consider Visibility as well in LazyContentPresenter.
 
 
 Version 4.1.0.7 (Milestone 7)
diff --git a/src/System.Waf/SharedAssemblyInfo.cs b/src/System.Waf/SharedAssemblyInfo.cs
index 0d13a782..0a63a954 100644
--- a/src/System.Waf/SharedAssemblyInfo.cs
+++ b/src/System.Waf/SharedAssemblyInfo.cs
@@ -13,6 +13,6 @@
 [assembly: NeutralResourcesLanguage("en-US")]
 
 
-[assembly: AssemblyVersion("4.1.0.7")]
-[assembly: AssemblyFileVersion("4.1.0.7")]
-[assembly: AssemblyInformationalVersion("4.1.0-alpha7")]
+[assembly: AssemblyVersion("4.1.0.91")]
+[assembly: AssemblyFileVersion("4.1.0.91")]
+[assembly: AssemblyInformationalVersion("4.1.0-rc1")]
diff --git a/src/System.Waf/System.Waf/System.Waf.Uwp/Properties/AssemblyInfo.cs b/src/System.Waf/System.Waf/System.Waf.Uwp/Properties/AssemblyInfo.cs
index 371045f4..9dc8e339 100644
--- a/src/System.Waf/System.Waf/System.Waf.Uwp/Properties/AssemblyInfo.cs
+++ b/src/System.Waf/System.Waf/System.Waf.Uwp/Properties/AssemblyInfo.cs
@@ -1,5 +1,7 @@
 using System;
 using System.Reflection;
+using System.Resources;
+using System.Runtime.InteropServices;
 
 [assembly: AssemblyTitle("System.Waf.Uwp")]
 [assembly: AssemblyDescription("System.Waf is a lightweight framework that helps you to create well-structured XAML applications. "
@@ -8,4 +10,19 @@
 [assembly: AssemblyProduct("System.Waf.Uwp")]
 
 
+[assembly: AssemblyCompany("jbe2277")]
+[assembly: AssemblyCopyright("Copyright © 2017 jbe2277")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+
+[assembly: ComVisible(false)]
+[assembly: NeutralResourcesLanguage("en-US")]
+
+
+[assembly: AssemblyVersion("4.1.0.91")]
+[assembly: AssemblyFileVersion("4.1.0.91")]
+[assembly: AssemblyInformationalVersion("4.1.0-alpha8")]
+
+
 [assembly: CLSCompliant(false)]
\ No newline at end of file
diff --git a/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj b/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj
index 9488135b..3466dc54 100644
--- a/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj
+++ b/src/System.Waf/System.Waf/System.Waf.Uwp/System.Waf.Uwp.csproj
@@ -46,9 +46,6 @@
     <None Include="System.Waf.Uwp.nuspec" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="..\..\SharedAssemblyInfo.cs">
-      <Link>Properties\SharedAssemblyInfo.cs</Link>
-    </Compile>
     <CodeAnalysisDictionary Include="..\..\CodeAnalysisDictionary.xml">
       <Link>Properties\CodeAnalysisDictionary.xml</Link>
     </CodeAnalysisDictionary>