diff --git a/.github/ISSUE_TEMPLATE/bug-report.md b/.github/ISSUE_TEMPLATE/bug-report.md
index 9753d57f710..ee90d788591 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.md
+++ b/.github/ISSUE_TEMPLATE/bug-report.md
@@ -41,8 +41,8 @@ Provide any additional context that may be helpful in understanding and/or resol
 Please add X in at least one of the boxes as appropriate. In order for an issue to be accepted, a developer needs to be able to reproduce the issue on a currently supported version. If you are looking for a workaround for an issue with an older version, please visit the forums at https://dnncommunity.org/forums
 -->
 * [ ] 10.00.00 alpha build
-* [ ] 09.06.02 release candidate
-* [ ] 09.06.01 latest supported release
+* [ ] 09.07.00 release candidate
+* [ ] 09.06.02 latest supported release
 
 ## Affected browser
 <!-- 
diff --git a/Build/Symbols/DotNetNuke_Symbols.dnn b/Build/Symbols/DotNetNuke_Symbols.dnn
index c6c00c53d15..ffe8163fb1c 100644
--- a/Build/Symbols/DotNetNuke_Symbols.dnn
+++ b/Build/Symbols/DotNetNuke_Symbols.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke_Symbols" type="Library" version="09.06.02" >
+    <package name="DotNetNuke_Symbols" type="Library" version="09.07.00" >
       <friendlyName>DNN Platform Symbols</friendlyName>
       <description>This package contains Debug Symbols and Intellisense files for DNN Platform.</description>
       <owner>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn
index 99577e83cf8..b175261e312 100644
--- a/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn	
+++ b/DNN Platform/Admin Modules/Dnn.Modules.Console/dnn_Console.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Console" type="Module" version="09.06.02">
+        <package name="DotNetNuke.Console" type="Module" version="09.07.00">
             <friendlyName>Console</friendlyName>
             <description>Display children pages as icon links for navigation.</description>
             <iconFile>~/DesktopModules/Admin/Console/console.png</iconFile>
diff --git a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn
index a7755aa270e..a0c074d43b0 100644
--- a/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn	
+++ b/DNN Platform/Admin Modules/Dnn.Modules.ModuleCreator/dnn_ModuleCreator.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.Module Creator" type="Module" version="09.06.02">
+        <package name="DotNetNuke.Module Creator" type="Module" version="09.07.00">
             <friendlyName>Module Creator</friendlyName>
             <description>Development of modules.</description>
             <iconFile>~/Icons/Sigma/ModuleCreator_32x32.png</iconFile>
diff --git a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn
index ac02fd38936..ed89989b7ca 100644
--- a/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn	
+++ b/DNN Platform/Components/Telerik/DotNetNuke.Telerik.Web.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Telerik.Web" type="Library" isSystem="true" version="09.07.00">
       <friendlyName>DotNetNuke Telerik Web Components</friendlyName>
       <description>Provides Telerik Components for DotNetNuke.</description>
       <dependencies/>
diff --git a/DNN Platform/Connectors/Azure/AzureConnector.dnn b/DNN Platform/Connectors/Azure/AzureConnector.dnn
index b7cbca02a11..29cacb6b28d 100644
--- a/DNN Platform/Connectors/Azure/AzureConnector.dnn	
+++ b/DNN Platform/Connectors/Azure/AzureConnector.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.06.02">
+        <package name="Dnn.AzureConnector" type="Connector" isSystem="false" version="09.07.00">
             <friendlyName>Dnn Azure Connector</friendlyName>
             <description>The Azure Connector allows you to integrate Azure as your commenting solution with the Publisher module.</description>
             <iconFile>~/DesktopModules/Connectors/Azure/Images/icon-azure-32px.png</iconFile>
diff --git a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn
index c9468bdb211..406821d1f05 100644
--- a/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn	
+++ b/DNN Platform/Connectors/GoogleAnalytics/GoogleAnalyticsConnector.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.06.02">
+        <package name="DNN.Connectors.GoogleAnalytics" type="Connector" isSystem="false" version="09.07.00">
             <friendlyName>Google Analytics Connector</friendlyName>
             <description>Configure your sites Google Analytics settings.</description>
             <iconFile>~/DesktopModules/Connectors/GoogleAnalytics/Images/GoogleAnalytics_32X32_Standard.png</iconFile>
diff --git a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn
index a8adb9242c7..b193d43a327 100644
--- a/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn	
+++ b/DNN Platform/Dnn.AuthServices.Jwt/Dnn.Jwt.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNJWT" type="Provider" version="09.06.02">
+    <package name="DNNJWT" type="Provider" version="09.07.00">
       <friendlyName>DNN JWT Auth Handler</friendlyName>
       <description>DNN Json Web Token Authentication (JWT) library for cookie-less Mobile authentication clients</description>
       <dependencies/>
diff --git a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn
index 67afb171489..a60c2fabe1e 100644
--- a/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn	
+++ b/DNN Platform/DotNetNuke.Web.Deprecated/dnn_Web_Deprecated.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Web.Deprecated" type="Library" isSystem="true" version="09.07.00">
       <friendlyName>DNN Deprecated Web Controls Library</friendlyName>
       <description>DNN Deprecated Web Controls library for legacy Telerik depepndency</description>
       <dependencies/>
diff --git a/DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs b/DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs
index 69c618a6c8b..a074252705c 100644
--- a/DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs	
+++ b/DNN Platform/DotNetNuke.Web/Common/DotNetNukeHttpApplication.cs	
@@ -35,6 +35,7 @@ namespace DotNetNuke.Web.Common.Internal
     using DotNetNuke.Services.Search.Internals;
     using DotNetNuke.Services.Sitemap;
     using DotNetNuke.Services.Tokens;
+    using DotNetNuke.Services.Mail;
     using DotNetNuke.Services.Url.FriendlyUrl;
 
     /// <summary>
@@ -164,6 +165,7 @@ private void Application_Start(object sender, EventArgs eventArgs)
             ComponentFactory.InstallComponents(new ProviderInstaller("clientcapability", typeof(ClientCapabilityProvider)));
             ComponentFactory.InstallComponents(new ProviderInstaller("cryptography", typeof(CryptographyProvider), typeof(FipsCompilanceCryptographyProvider)));
 			ComponentFactory.InstallComponents(new ProviderInstaller("tokens", typeof(TokenProvider)));
+            ComponentFactory.InstallComponents(new ProviderInstaller("mail", typeof(MailProvider)));
 
             Logger.InfoFormat("Application Started ({0})", Globals.ElapsedSinceAppStart); // just to start the timer
             DotNetNukeShutdownOverload.InitializeFcnSettings();
diff --git a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn
index c470f5a7a5a..efcd8e9c759 100644
--- a/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn	
+++ b/DNN Platform/DotNetNuke.WebUtility/DotNetNuke.ClientAPI.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="DotNetNuke.ClientAPI" type="Library" version="09.06.02" >
+        <package name="DotNetNuke.ClientAPI" type="Library" version="09.07.00" >
             <friendlyName>DotNetNuke ClientAPI</friendlyName>
             <description>The DotNetNuke Client API is composed of both server-side and client-side code that works together to enable a simple and reliable interface for the developer to provide a rich client-side experience.</description>
             <dependencies/>
diff --git a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn
index 51c59d6aacb..25d44ec9d9f 100644
--- a/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn	
+++ b/DNN Platform/DotNetNuke.Website.Deprecated/dnn_Website_Deprecated.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Website.Deprecated" type="Library" isSystem="true" version="09.07.00">
       <friendlyName>DNN Deprecated Website Codebehind files</friendlyName>
       <description>DNN Deprecated Website Codebehind files for backward compability.</description>
       <dependencies/>
diff --git a/DNN Platform/Library/DotNetNuke.Library.csproj b/DNN Platform/Library/DotNetNuke.Library.csproj
index f095e188971..7ff97aafb2a 100644
--- a/DNN Platform/Library/DotNetNuke.Library.csproj	
+++ b/DNN Platform/Library/DotNetNuke.Library.csproj	
@@ -814,6 +814,10 @@
     <Compile Include="Services\Localization\Persian\PersianCalendar.cs" />
     <Compile Include="Services\Localization\Persian\PersianController.cs" />
     <Compile Include="Services\Log\EventLog\ILogController.cs" />
+    <Compile Include="Services\Mail\CoreMailProvider.cs" />
+    <Compile Include="Services\Mail\SMTPInfo.cs" />
+    <Compile Include="Services\Mail\MailInfo.cs" />
+    <Compile Include="Services\Mail\MailProvider.cs" />
     <Compile Include="Services\OutputCache\Providers\DatabaseProvider.cs" />
     <Compile Include="Services\OutputCache\Providers\DatabaseResponseFilter.cs" />
     <Compile Include="Services\OutputCache\Providers\FileProvider.cs" />
diff --git a/DNN Platform/Library/Services/Mail/CoreMailProvider.cs b/DNN Platform/Library/Services/Mail/CoreMailProvider.cs
new file mode 100644
index 00000000000..94ae60bfba8
--- /dev/null
+++ b/DNN Platform/Library/Services/Mail/CoreMailProvider.cs	
@@ -0,0 +1,216 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+using DotNetNuke.Common.Utilities;
+using DotNetNuke.Entities.Host;
+using DotNetNuke.Entities.Portals;
+using System;
+using System.Net;
+using System.Net.Mail;
+using System.Text.RegularExpressions;
+using Localize = DotNetNuke.Services.Localization.Localization;
+namespace DotNetNuke.Services.Mail
+{
+    public class CoreMailProvider : MailProvider
+    {
+        private static readonly Regex SmtpServerRegex = new Regex("^[^:]+(:[0-9]{1,5})?$", RegexOptions.Compiled);
+        private static string ConvertToText(string sHTML)
+        {
+            var formattedHtml = HtmlUtils.FormatText(sHTML, true);
+            var styleLessHtml = HtmlUtils.RemoveInlineStyle(formattedHtml);
+            return HtmlUtils.StripTags(styleLessHtml, true);
+        }
+        public override string SendMail(MailInfo mailInfo, SMTPInfo smtpInfo = null)
+        {
+            // validate smtp server
+            if (smtpInfo == null || string.IsNullOrEmpty(smtpInfo.Server))
+            {
+                if (string.IsNullOrWhiteSpace(Host.SMTPServer))
+                {
+                    return "SMTP Server not configured";
+                }
+
+                smtpInfo = new SMTPInfo()
+                {
+                    Server = Host.SMTPServer,
+                    Authentication = Host.SMTPAuthentication,
+                    Username = Host.SMTPUsername,
+                    Password = Host.SMTPPassword,
+                    EnableSSL = Host.EnableSMTPSSL,
+                };
+            }
+
+            // translate semi-colon delimiters to commas as ASP.NET 2.0 does not support semi-colons
+            if (!string.IsNullOrEmpty(mailInfo.To))
+            {
+                mailInfo.To = mailInfo.To.Replace(";", ",");
+            }
+
+            if (!string.IsNullOrEmpty(mailInfo.CC))
+            {
+                mailInfo.To = mailInfo.To.Replace(";", ",");
+            }
+
+            if (!string.IsNullOrEmpty(mailInfo.BCC))
+            {
+                mailInfo.To = mailInfo.To.Replace(";", ",");
+            }
+
+            string retValue = string.Empty;
+
+            MailMessage mailMessage = new MailMessage(mailInfo.From, mailInfo.To);
+
+            if (!string.IsNullOrEmpty(mailInfo.Sender))
+            {
+                mailMessage.Sender = new MailAddress(mailInfo.Sender);
+            }
+
+            mailMessage.Priority = (System.Net.Mail.MailPriority)mailInfo.Priority;
+            mailMessage.IsBodyHtml = mailInfo.BodyFormat == MailFormat.Html;
+
+            // Only modify senderAdress if smtpAuthentication is enabled
+            // Can be "0", empty or Null - anonymous, "1" - basic, "2" - NTLM.
+            if (smtpInfo.Authentication == "1" || smtpInfo.Authentication == "2")
+            {
+                // if the senderAddress is the email address of the Host then switch it smtpUsername if different
+                // if display name of senderAddress is empty, then use Host.HostTitle for it
+                if (mailMessage.Sender != null)
+                {
+                    var senderAddress = mailInfo.Sender;
+                    var senderDisplayName = mailInfo.FromName;
+                    var needUpdateSender = false;
+                    if (smtpInfo.Username.Contains("@") && senderAddress == Host.HostEmail &&
+                        !senderAddress.Equals(smtpInfo.Username, StringComparison.InvariantCultureIgnoreCase))
+                    {
+                        senderAddress = smtpInfo.Username;
+                        needUpdateSender = true;
+                    }
+
+                    if (string.IsNullOrEmpty(senderDisplayName))
+                    {
+                        senderDisplayName = Host.SMTPPortalEnabled ? PortalSettings.Current.PortalName : Host.HostTitle;
+                        needUpdateSender = true;
+                    }
+
+                    if (needUpdateSender)
+                    {
+                        mailMessage.Sender = new MailAddress(senderAddress, senderDisplayName);
+                    }
+                }
+                else if (smtpInfo.Username.Contains("@"))
+                {
+                    mailMessage.Sender = new MailAddress(smtpInfo.Username, Host.SMTPPortalEnabled ? PortalSettings.Current.PortalName : Host.HostTitle);
+                }
+            }
+
+            //attachments
+            if (mailInfo.Attachments != null)
+            {
+                foreach (var attachment in mailInfo.Attachments)
+                {
+                    mailMessage.Attachments.Add(attachment);
+                }
+            }
+
+            // message
+            mailMessage.SubjectEncoding = mailInfo.BodyEncoding;
+            mailMessage.Subject = HtmlUtils.StripWhiteSpace(mailInfo.Subject, true);
+            mailMessage.BodyEncoding = mailInfo.BodyEncoding;
+
+            // added support for multipart html messages
+            // add text part as alternate view
+            var PlainView = AlternateView.CreateAlternateViewFromString(ConvertToText(mailInfo.Body), null, "text/plain");
+            mailMessage.AlternateViews.Add(PlainView);
+            if (mailMessage.IsBodyHtml)
+            {
+                var HTMLView = AlternateView.CreateAlternateViewFromString(mailInfo.Body, null, "text/html");
+                mailMessage.AlternateViews.Add(HTMLView);
+            }
+
+            smtpInfo.Server = smtpInfo.Server.Trim();
+            if (SmtpServerRegex.IsMatch(smtpInfo.Server))
+            {
+                try
+                {
+                    // to workaround problem in 4.0 need to specify host name
+                    using (var smtpClient = new SmtpClient())
+                    {
+                        var smtpHostParts = smtpInfo.Server.Split(':');
+                        smtpClient.Host = smtpHostParts[0];
+                        if (smtpHostParts.Length > 1)
+                        {
+                            // port is guaranteed to be of max 5 digits numeric by the RegEx check
+                            var port = Convert.ToInt32(smtpHostParts[1]);
+                            if (port < 1 || port > 65535)
+                            {
+                                return Localize.GetString("SmtpInvalidPort");
+                            }
+
+                            smtpClient.Port = port;
+                        }
+
+                        // else the port defaults to 25 by .NET when not set
+                        smtpClient.ServicePoint.MaxIdleTime = Host.SMTPMaxIdleTime;
+                        smtpClient.ServicePoint.ConnectionLimit = Host.SMTPConnectionLimit;
+
+                        switch (smtpInfo.Authentication)
+                        {
+                            case "":
+                            case "0": // anonymous
+                                break;
+                            case "1": // basic
+                                if (!string.IsNullOrEmpty(smtpInfo.Username) && !string.IsNullOrEmpty(smtpInfo.Password))
+                                {
+                                    smtpClient.UseDefaultCredentials = false;
+                                    smtpClient.Credentials = new NetworkCredential(smtpInfo.Username, smtpInfo.Password);
+                                }
+
+                                break;
+                            case "2": // NTLM
+                                smtpClient.UseDefaultCredentials = true;
+                                break;
+                        }
+
+                        smtpClient.EnableSsl = smtpInfo.EnableSSL;
+                        smtpClient.Send(mailMessage);
+                        smtpClient.Dispose();
+                    }
+                }
+                catch (Exception exc)
+                {
+                    var exc2 = exc as SmtpFailedRecipientException;
+                    if (exc2 != null)
+                    {
+                        retValue = string.Format(Localize.GetString("FailedRecipient"), exc2.FailedRecipient) + " ";
+                    }
+                    else if (exc is SmtpException)
+                    {
+                        retValue = Localize.GetString("SMTPConfigurationProblem") + " ";
+                    }
+
+                    // mail configuration problem
+                    if (exc.InnerException != null)
+                    {
+                        retValue += string.Concat(exc.Message, Environment.NewLine, exc.InnerException.Message);
+                        Exceptions.Exceptions.LogException(exc.InnerException);
+                    }
+                    else
+                    {
+                        retValue += exc.Message;
+                        Exceptions.Exceptions.LogException(exc);
+                    }
+                }
+                finally
+                {
+                    mailMessage.Dispose();
+                }
+            }
+            else
+            {
+                retValue = Localize.GetString("SMTPConfigurationProblem");
+            }
+
+            return retValue;
+        }
+    }
+}
diff --git a/DNN Platform/Library/Services/Mail/Mail.cs b/DNN Platform/Library/Services/Mail/Mail.cs
index 32d741274b0..48a1c55623a 100644
--- a/DNN Platform/Library/Services/Mail/Mail.cs	
+++ b/DNN Platform/Library/Services/Mail/Mail.cs	
@@ -24,14 +24,6 @@ namespace DotNetNuke.Services.Mail
 
     public class Mail
     {
-        private static readonly Regex SmtpServerRegex = new Regex("^[^:]+(:[0-9]{1,5})?$", RegexOptions.Compiled);
-
-        public static string ConvertToText(string sHTML)
-        {
-            var formattedHtml = HtmlUtils.FormatText(sHTML, true);
-            var styleLessHtml = HtmlUtils.RemoveInlineStyle(formattedHtml);
-            return HtmlUtils.StripTags(styleLessHtml, true);
-        }
 
         public static bool IsValidEmailAddress(string Email, int portalid)
         {
@@ -59,31 +51,38 @@ public static void SendEmail(string fromAddress, string senderAddress, string to
                 return;
             }
 
-            using (var emailMessage = new MailMessage(fromAddress, toAddress) { Sender = new MailAddress(senderAddress) })
-            {
-                SendMailInternal(emailMessage, subject, body, MailPriority.Normal,
-                    HtmlUtils.IsHtml(body) ? MailFormat.Html : MailFormat.Text,
-                    Encoding.UTF8, new List<Attachment>(),
-                    Host.SMTPServer, Host.SMTPAuthentication, Host.SMTPUsername,
-                    Host.SMTPPassword, Host.EnableSMTPSSL);
-            }
+            MailInfo mailInfo = new MailInfo()
+            {
+                From = fromAddress,
+                Sender = senderAddress,
+                To = toAddress,
+                Subject = subject,
+                Body = body,
+                Priority = MailPriority.Normal,
+                BodyFormat = HtmlUtils.IsHtml(body) ? MailFormat.Html : MailFormat.Text,
+                BodyEncoding = Encoding.UTF8,
+            };
+
+            MailProvider.Instance().SendMail(mailInfo);
         }
 
         public static string SendEmail(string fromAddress, string senderAddress, string toAddress, string subject, string body, List<Attachment> attachments)
         {
-            if (string.IsNullOrWhiteSpace(Host.SMTPServer))
-            {
-                return "SMTP Server not configured";
-            }
-
-            using (var emailMessage = new MailMessage(fromAddress, toAddress) { Sender = new MailAddress(senderAddress) })
-            {
-                return SendMailInternal(emailMessage, subject, body, MailPriority.Normal,
-                    HtmlUtils.IsHtml(body) ? MailFormat.Html : MailFormat.Text,
-                    Encoding.UTF8, attachments,
-                    Host.SMTPServer, Host.SMTPAuthentication, Host.SMTPUsername,
-                    Host.SMTPPassword, Host.EnableSMTPSSL);
-            }
+            MailInfo mailInfo = new MailInfo()
+            {
+                From = fromAddress,
+                Sender = senderAddress,
+                To = toAddress,
+                Subject = subject,
+                Body = body,
+                Priority = MailPriority.Normal,
+                BodyFormat = HtmlUtils.IsHtml(body) ? MailFormat.Html : MailFormat.Text,
+                BodyEncoding = Encoding.UTF8,
+                Attachments = attachments,
+            };
+
+            
+            return MailProvider.Instance().SendMail(mailInfo);
         }
 
         /// -----------------------------------------------------------------------------
@@ -394,232 +393,37 @@ public static string SendMail(string mailFrom, string mailTo, string cc, string
         public static string SendMail(string mailFrom, string mailSender, string mailTo, string cc, string bcc, string replyTo, MailPriority priority, string subject, MailFormat bodyFormat, Encoding bodyEncoding,
                                       string body, List<Attachment> attachments, string smtpServer, string smtpAuthentication, string smtpUsername, string smtpPassword, bool smtpEnableSSL)
         {
-            // SMTP server configuration
-            if (string.IsNullOrWhiteSpace(smtpServer) && !string.IsNullOrWhiteSpace(Host.SMTPServer))
-            {
-                smtpServer = Host.SMTPServer;
-            }
-
-            if (string.IsNullOrEmpty(smtpAuthentication) && !string.IsNullOrEmpty(Host.SMTPAuthentication))
-            {
-                smtpAuthentication = Host.SMTPAuthentication;
-            }
-
-            if (string.IsNullOrEmpty(smtpUsername) && !string.IsNullOrEmpty(Host.SMTPUsername))
-            {
-                smtpUsername = Host.SMTPUsername;
-            }
-
-            if (string.IsNullOrEmpty(smtpPassword) && !string.IsNullOrEmpty(Host.SMTPPassword))
-            {
-                smtpPassword = Host.SMTPPassword;
-            }
-
-            MailMessage mailMessage = null;
-            if (PortalSettings.Current != null)
-            {
-                mailMessage = (UserController.GetUserByEmail(PortalSettings.Current.PortalId, mailFrom) != null)
-                    ? new MailMessage
-                    {
-                        From =
-                            new MailAddress(
-                                mailFrom,
-                                UserController.GetUserByEmail(PortalSettings.Current.PortalId, mailFrom).DisplayName),
-                    }
-                    : new MailMessage { From = new MailAddress(mailFrom) };
-            }
-            else
-            {
-                mailMessage = new MailMessage { From = new MailAddress(mailFrom) };
-            }
-
-            if (!string.IsNullOrEmpty(mailSender))
-            {
-                mailMessage.Sender = new MailAddress(mailSender);
-            }
-
-            if (!string.IsNullOrEmpty(mailTo))
-            {
-                // translate semi-colon delimiters to commas as ASP.NET 2.0 does not support semi-colons
-                mailTo = mailTo.Replace(";", ",");
-                mailMessage.To.Add(mailTo);
-            }
-
-            if (!string.IsNullOrEmpty(cc))
-            {
-                // translate semi-colon delimiters to commas as ASP.NET 2.0 does not support semi-colons
-                cc = cc.Replace(";", ",");
-                mailMessage.CC.Add(cc);
-            }
-
-            if (!string.IsNullOrEmpty(bcc))
-            {
-                // translate semi-colon delimiters to commas as ASP.NET 2.0 does not support semi-colons
-                bcc = bcc.Replace(";", ",");
-                mailMessage.Bcc.Add(bcc);
-            }
-
-            if (replyTo != string.Empty)
-            {
-                mailMessage.ReplyToList.Add(new MailAddress(replyTo));
-            }
-
-            using (mailMessage)
-            {
-                return SendMailInternal(mailMessage, subject, body, priority, bodyFormat, bodyEncoding,
-                    attachments, smtpServer, smtpAuthentication, smtpUsername, smtpPassword, smtpEnableSSL);
-            }
-        }
-
-        private static string SendMailInternal(MailMessage mailMessage, string subject, string body, MailPriority priority,
-                                MailFormat bodyFormat, Encoding bodyEncoding, IEnumerable<Attachment> attachments,
-                                string smtpServer, string smtpAuthentication, string smtpUsername, string smtpPassword, bool smtpEnableSSL)
-        {
-            string retValue = string.Empty;
-
-            mailMessage.Priority = (System.Net.Mail.MailPriority)priority;
-            mailMessage.IsBodyHtml = bodyFormat == MailFormat.Html;
-
-            // Only modify senderAdress if smtpAuthentication is enabled
-            // Can be "0", empty or Null - anonymous, "1" - basic, "2" - NTLM.
-            if (smtpAuthentication == "1" || smtpAuthentication == "2")
-            {
-                // if the senderAddress is the email address of the Host then switch it smtpUsername if different
-                // if display name of senderAddress is empty, then use Host.HostTitle for it
-                if (mailMessage.Sender != null)
-                {
-                    var senderAddress = mailMessage.Sender.Address;
-                    var senderDisplayName = mailMessage.Sender.DisplayName;
-                    var needUpdateSender = false;
-                    if (smtpUsername.Contains("@") && senderAddress == Host.HostEmail &&
-                        !senderAddress.Equals(smtpUsername, StringComparison.InvariantCultureIgnoreCase))
-                    {
-                        senderAddress = smtpUsername;
-                        needUpdateSender = true;
-                    }
-
-                    if (string.IsNullOrEmpty(senderDisplayName))
-                    {
-                        senderDisplayName = Host.SMTPPortalEnabled ? PortalSettings.Current.PortalName : Host.HostTitle;
-                        needUpdateSender = true;
-                    }
-
-                    if (needUpdateSender)
-                    {
-                        mailMessage.Sender = new MailAddress(senderAddress, senderDisplayName);
-                    }
-                }
-                else if (smtpUsername.Contains("@"))
-                {
-                    mailMessage.Sender = new MailAddress(smtpUsername, Host.SMTPPortalEnabled ? PortalSettings.Current.PortalName : Host.HostTitle);
-                }
-            }
-
-            // attachments
-            foreach (var attachment in attachments)
-            {
-                mailMessage.Attachments.Add(attachment);
-            }
-
-            // message
-            mailMessage.SubjectEncoding = bodyEncoding;
-            mailMessage.Subject = HtmlUtils.StripWhiteSpace(subject, true);
-            mailMessage.BodyEncoding = bodyEncoding;
-
-            // added support for multipart html messages
-            // add text part as alternate view
-            var PlainView = AlternateView.CreateAlternateViewFromString(ConvertToText(body), null, "text/plain");
-            mailMessage.AlternateViews.Add(PlainView);
-            if (mailMessage.IsBodyHtml)
-            {
-                var HTMLView = AlternateView.CreateAlternateViewFromString(body, null, "text/html");
-                mailMessage.AlternateViews.Add(HTMLView);
-            }
-
-            smtpServer = smtpServer.Trim();
-            if (SmtpServerRegex.IsMatch(smtpServer))
-            {
-                try
-                {
-                    // to workaround problem in 4.0 need to specify host name
-                    using (var smtpClient = new SmtpClient())
-                    {
-                        var smtpHostParts = smtpServer.Split(':');
-                        smtpClient.Host = smtpHostParts[0];
-                        if (smtpHostParts.Length > 1)
-                        {
-                            // port is guaranteed to be of max 5 digits numeric by the RegEx check
-                            var port = Convert.ToInt32(smtpHostParts[1]);
-                            if (port < 1 || port > 65535)
-                            {
-                                return Localize.GetString("SmtpInvalidPort");
-                            }
-
-                            smtpClient.Port = port;
-                        }
-
-                        // else the port defaults to 25 by .NET when not set
-                        smtpClient.ServicePoint.MaxIdleTime = Host.SMTPMaxIdleTime;
-                        smtpClient.ServicePoint.ConnectionLimit = Host.SMTPConnectionLimit;
-
-                        switch (smtpAuthentication)
-                        {
-                            case "":
-                            case "0": // anonymous
-                                break;
-                            case "1": // basic
-                                if (!string.IsNullOrEmpty(smtpUsername) && !string.IsNullOrEmpty(smtpPassword))
-                                {
-                                    smtpClient.UseDefaultCredentials = false;
-                                    smtpClient.Credentials = new NetworkCredential(smtpUsername, smtpPassword);
-                                }
-
-                                break;
-                            case "2": // NTLM
-                                smtpClient.UseDefaultCredentials = true;
-                                break;
-                        }
-
-                        smtpClient.EnableSsl = smtpEnableSSL;
-                        smtpClient.Send(mailMessage);
-                        smtpClient.Dispose();
-                    }
-                }
-                catch (Exception exc)
-                {
-                    var exc2 = exc as SmtpFailedRecipientException;
-                    if (exc2 != null)
-                    {
-                        retValue = string.Format(Localize.GetString("FailedRecipient"), exc2.FailedRecipient) + " ";
-                    }
-                    else if (exc is SmtpException)
-                    {
-                        retValue = Localize.GetString("SMTPConfigurationProblem") + " ";
-                    }
-
-                    // mail configuration problem
-                    if (exc.InnerException != null)
-                    {
-                        retValue += string.Concat(exc.Message, Environment.NewLine, exc.InnerException.Message);
-                        Exceptions.Exceptions.LogException(exc.InnerException);
-                    }
-                    else
-                    {
-                        retValue += exc.Message;
-                        Exceptions.Exceptions.LogException(exc);
-                    }
-                }
-                finally
-                {
-                    mailMessage.Dispose();
-                }
-            }
-            else
+            SMTPInfo smtpInfo = new SMTPInfo()
+            {
+                Server = smtpServer,
+                Authentication = smtpAuthentication,
+                Username = smtpUsername,
+                Password = smtpPassword,
+                EnableSSL = smtpEnableSSL,
+            };
+
+            MailInfo mailInfo = new MailInfo()
             {
-                retValue = Localize.GetString("SMTPConfigurationProblem");
+                From = mailFrom,
+                Sender = mailSender,
+                To = mailTo,
+                CC = cc,
+                BCC = bcc,
+                ReplyTo = replyTo,
+                Priority = priority,
+                BodyEncoding = bodyEncoding,
+                BodyFormat = bodyFormat,
+                Body = body,
+                Subject = subject,
+                Attachments = attachments,
+            };
+
+            if (PortalSettings.Current != null && UserController.GetUserByEmail(PortalSettings.Current.PortalId, mailFrom) != null)
+            {
+                mailInfo.FromName = UserController.GetUserByEmail(PortalSettings.Current.PortalId, mailFrom).DisplayName;
             }
 
-            return retValue;
+            return MailProvider.Instance().SendMail(mailInfo, smtpInfo);
         }
     }
 }
diff --git a/DNN Platform/Library/Services/Mail/MailInfo.cs b/DNN Platform/Library/Services/Mail/MailInfo.cs
new file mode 100644
index 00000000000..12532f74af1
--- /dev/null
+++ b/DNN Platform/Library/Services/Mail/MailInfo.cs	
@@ -0,0 +1,77 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+using System.Collections.Generic;
+using System.Net.Mail;
+using System.Text;
+
+namespace DotNetNuke.Services.Mail
+{
+    public class MailInfo
+    {
+        /// <summary>
+        /// Gets or sets From email address.
+        /// </summary>
+        public string From { get; set; }
+
+        /// <summary>
+        /// Gets or sets sender email address.
+        /// </summary>
+        public string Sender { get; set; }
+
+        /// <summary>
+        /// Gets or sets To email address.
+        /// </summary>
+        public string To { get; set; }
+
+        /// <summary>
+        /// Gets or sets From Name.
+        /// </summary>
+        public string FromName { get; set; }
+
+        /// <summary>
+        /// Gets or sets CC email address.
+        /// </summary>
+        public string CC { get; set; }
+
+        /// <summary>
+        /// Gets or sets BCC email address.
+        /// </summary>
+        public string BCC { get; set; }
+
+        /// <summary>
+        /// Gets or sets Reply To email address.
+        /// </summary>
+        public string ReplyTo { get; set; }
+
+        /// <summary>
+        /// Gets or sets Body of email.
+        /// </summary>
+        public string Body { get; set; }
+
+        /// <summary>
+        /// Gets or sets Subject of email.
+        /// </summary>
+        public string Subject { get; set; }
+
+        /// <summary>
+        /// Gets or sets Priority.
+        /// </summary>
+        public MailPriority Priority { get; set; }
+
+        /// <summary>
+        /// Gets or sets Body Encoding.
+        /// </summary>
+        public Encoding BodyEncoding { get; set; }
+
+        /// <summary>
+        /// Gets or sets Body Encoding.
+        /// </summary>
+        public MailFormat BodyFormat { get; set; }
+
+        /// <summary>
+        /// Gets or sets mail attachments.
+        /// </summary>
+        public List<Attachment> Attachments { get; set; }
+    }
+}
diff --git a/DNN Platform/Library/Services/Mail/MailProvider.cs b/DNN Platform/Library/Services/Mail/MailProvider.cs
new file mode 100644
index 00000000000..7809025df0d
--- /dev/null
+++ b/DNN Platform/Library/Services/Mail/MailProvider.cs	
@@ -0,0 +1,18 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+using DotNetNuke.ComponentModel;
+
+namespace DotNetNuke.Services.Mail
+{
+    public abstract class MailProvider
+    {
+        public abstract string SendMail(MailInfo mailInfo, SMTPInfo smtpInfo = null);
+
+        // return the provider
+        public static MailProvider Instance()
+        {
+            return ComponentFactory.GetComponent<MailProvider>();
+        }
+    }
+}
diff --git a/DNN Platform/Library/Services/Mail/SMTPInfo.cs b/DNN Platform/Library/Services/Mail/SMTPInfo.cs
new file mode 100644
index 00000000000..8f2923dea3b
--- /dev/null
+++ b/DNN Platform/Library/Services/Mail/SMTPInfo.cs	
@@ -0,0 +1,35 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information
+using System.Text;
+
+namespace DotNetNuke.Services.Mail
+{
+    public class SMTPInfo
+    {
+        /// <summary>
+        /// Gets or sets SMTP Server.
+        /// </summary>
+        public string Server { get; set; }
+
+        /// <summary>
+        /// Gets or sets SMTP Authentication.
+        /// </summary>
+        public string Authentication { get; set; }
+
+        /// <summary>
+        /// Gets or sets SMTP Username.
+        /// </summary>
+        public string Username { get; set; }
+
+        /// <summary>
+        /// Gets or sets SMTP Password.
+        /// </summary>
+        public string Password { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether SSL should be enabled or disabled.
+        /// </summary>
+        public bool EnableSSL { get; set; }
+    }
+}
diff --git a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn
index 690158b1800..290b9b0a819 100644
--- a/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn	
+++ b/DNN Platform/Modules/CoreMessaging/CoreMessaging.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Modules.CoreMessaging" type="Module" isSystem="true" version="09.07.00">
       <friendlyName>Message Center</friendlyName>      
       <description>Core Messaging module allows users to message each other.</description>
       <iconFile>~/DesktopModules/CoreMessaging/Images/messaging_32X32.png</iconFile>
diff --git a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn
index 84814105449..7caea28a48f 100644
--- a/DNN Platform/Modules/DDRMenu/DDRMenu.dnn	
+++ b/DNN Platform/Modules/DDRMenu/DDRMenu.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
 	<packages>
-		<package name="DDRMenu" type="Module" version="09.06.02">
+		<package name="DDRMenu" type="Module" version="09.07.00">
 			<friendlyName>DDR Menu</friendlyName>
 			<description>DotNetNuke Navigation Provider.</description>
 			<owner>
diff --git a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn
index 39aae4981c6..10490de7712 100644
--- a/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn	
+++ b/DNN Platform/Modules/DigitalAssets/dnn_DigitalAssets.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.06.02">
+    <package name="DigitalAssetsManagement" type="Module" isSystem="true" version="09.07.00">
       <friendlyName>Digital Asset Management</friendlyName>
       <description>DotNetNuke Corporation Digital Asset Management module</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>
diff --git a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn
index 61e587929d1..1719629dfdf 100644
--- a/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn	
+++ b/DNN Platform/Modules/DnnExportImport/dnn_SiteExportImport.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="SiteExportImport" type="Library" isSystem="false" version="09.06.02">
+    <package name="SiteExportImport" type="Library" isSystem="false" version="09.07.00">
       <friendlyName>Site Export Import</friendlyName>
       <description>DotNetNuke Corporation Site Export Import Library</description>
       <iconFile>Images/Files_32x32_Standard.png</iconFile>
diff --git a/DNN Platform/Modules/Groups/SocialGroups.dnn b/DNN Platform/Modules/Groups/SocialGroups.dnn
index 1e23d1bc116..7c46b8960fe 100644
--- a/DNN Platform/Modules/Groups/SocialGroups.dnn	
+++ b/DNN Platform/Modules/Groups/SocialGroups.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="Social Groups" type="Module" isSystem="true" version="09.06.02">
+    <package name="Social Groups" type="Module" isSystem="true" version="09.07.00">
       <friendlyName>Social Groups</friendlyName>
       <description>DotNetNuke Corporation Social Groups module</description>
       <iconFile>~/DesktopModules/SocialGroups/Images/Social_Groups_32X32.png</iconFile>
diff --git a/DNN Platform/Modules/HTML/dnn_HTML.dnn b/DNN Platform/Modules/HTML/dnn_HTML.dnn
index c740ae5227b..680c273167b 100644
--- a/DNN Platform/Modules/HTML/dnn_HTML.dnn	
+++ b/DNN Platform/Modules/HTML/dnn_HTML.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_HTML" type="Module" version="09.06.02">
+    <package name="DNN_HTML" type="Module" version="09.07.00">
       <friendlyName>HTML</friendlyName>
       <description>This module renders a block of HTML or Text content. The Html/Text module allows authorized users to edit the content either inline or in a separate administration page. Optional tokens can be used that get replaced dynamically during display. All versions of content are stored in the database including the ability to rollback to an older version.</description>
       <iconFile>DesktopModules\HTML\Images\html.png</iconFile>
diff --git a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn
index 812e0654aa7..bc394c57fe3 100644
--- a/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn	
+++ b/DNN Platform/Modules/HtmlEditorManager/dnn_HtmlEditorManager.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.06.02" >
+    <package name="DotNetNuke.HtmlEditorManager" type="Module" version="09.07.00" >
       <friendlyName>Html Editor Management</friendlyName>
       <iconFile>Images/HtmlEditorManager_Standard_32x32.png</iconFile>
       <description>A module used to configure toolbar items, behavior, and other options used in the DotNetNuke HtmlEditor Provider.</description>
diff --git a/DNN Platform/Modules/Journal/Journal.dnn b/DNN Platform/Modules/Journal/Journal.dnn
index 1e02cc6a95b..a0b1edd9d82 100644
--- a/DNN Platform/Modules/Journal/Journal.dnn	
+++ b/DNN Platform/Modules/Journal/Journal.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Journal" type="Module" isSystem="true" version="09.06.02">
+        <package name="Journal" type="Module" isSystem="true" version="09.07.00">
             <friendlyName>Journal</friendlyName>
             <description>DotNetNuke Corporation Journal module</description>
             <iconFile>DesktopModules/Journal/Images/journal_32X32.png</iconFile>
diff --git a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn
index 5a7e262f5b5..f6887769201 100644
--- a/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn	
+++ b/DNN Platform/Modules/MemberDirectory/MemberDirectory.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="6.0">
   <packages>
-    <package name="DotNetNuke.Modules.MemberDirectory" type="Module"  isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Modules.MemberDirectory" type="Module"  isSystem="true" version="09.07.00">
       <friendlyName>Member Directory</friendlyName>      
       <description>The Member Directory module displays a list of Members based on role, profile property or relationship.</description>
       <iconFile>~/DesktopModules/MemberDirectory/Images/member_list_32X32.png</iconFile>
diff --git a/DNN Platform/Modules/RazorHost/Manifest.dnn b/DNN Platform/Modules/RazorHost/Manifest.dnn
index cfc393afdf5..ba9bb60b52b 100644
--- a/DNN Platform/Modules/RazorHost/Manifest.dnn	
+++ b/DNN Platform/Modules/RazorHost/Manifest.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="{0}" type="Module"  isSystem="true" version="09.06.02">
+    <package name="{0}" type="Module"  isSystem="true" version="09.07.00">
       <friendlyName>{0}</friendlyName>
       <description>{1}</description>
       <owner>
diff --git a/DNN Platform/Modules/RazorHost/RazorHost.dnn b/DNN Platform/Modules/RazorHost/RazorHost.dnn
index b9c5e656927..487e17e8968 100644
--- a/DNN Platform/Modules/RazorHost/RazorHost.dnn	
+++ b/DNN Platform/Modules/RazorHost/RazorHost.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNNCorp.RazorHost" type="Module" version="09.06.02" >
+    <package name="DNNCorp.RazorHost" type="Module" version="09.07.00" >
       <friendlyName>Razor Host</friendlyName>
       <description>The Razor Host module allows developers to host Razor Scripts.</description>
       <owner>
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn
index c9e49383d47..77f3b08ae4b 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Facebook/Facebook_Auth.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_FacebookAuthentication" type="Auth_System" version="09.06.02" >
+    <package name="DNN_FacebookAuthentication" type="Auth_System" version="09.07.00" >
       <friendlyName>DotNetNuke Facebook Authentication Project</friendlyName>
       <description>The DotNetNuke Facebook Authentication Project is an Authentication provider for DotNetNuke that uses 
         Facebook authentication to authenticate users.
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn
index 0335e398c32..7049a0cac24 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Google/Google_Auth.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_GoogleAuthentication" type="Auth_System" version="09.06.02" >
+    <package name="DNN_GoogleAuthentication" type="Auth_System" version="09.07.00" >
       <friendlyName>DotNetNuke Google Authentication Project</friendlyName>
       <description>The DotNetNuke Google Authentication Project is an Authentication provider for DotNetNuke that uses 
         Google authentication to authenticate users.
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn
index 8d109f5f789..f2403e42664 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.LiveConnect/Live_Auth.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_LiveAuthentication" type="Auth_System" version="09.06.02" >
+    <package name="DNN_LiveAuthentication" type="Auth_System" version="09.07.00" >
       <friendlyName>DotNetNuke Live Authentication Project</friendlyName>
       <description>
         The DotNetNuke Live Authentication Project is an Authentication provider for DotNetNuke that uses
diff --git a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn
index 2bc2765e051..3535b3cd587 100644
--- a/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn	
+++ b/DNN Platform/Providers/AuthenticationProviders/DotNetNuke.Authentication.Twitter/Twitter_Auth.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_TwitterAuthentication" type="Auth_System" version="09.06.02" >
+    <package name="DNN_TwitterAuthentication" type="Auth_System" version="09.07.00" >
       <friendlyName>DotNetNuke Twitter Authentication Project</friendlyName>
       <description>
         The DotNetNuke Twitter Authentication Project is an Authentication provider for DotNetNuke that uses
diff --git a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn
index 11064ed0f78..80e65cc9214 100644
--- a/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn	
+++ b/DNN Platform/Providers/CachingProviders/DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider/SimpleWebFarmCachingProvider.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider" type="Provider" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider" type="Provider" isSystem="true" version="09.07.00">
       <friendlyName>DotNetNuke Simple Web Farm Caching Provider</friendlyName>
       <description>DotNetNuke Simple Web Farm Caching Provider</description>
       <dependencies/>
diff --git a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn
index 7e80353a1a9..f121f14e896 100644
--- a/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn	
+++ b/DNN Platform/Providers/ClientCapabilityProviders/Provider.AspNetCCP/AspNetClientCapabilityProvider.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="AspNetClientCapabilityProvider" type="Provider" version="09.06.02">
+    <package name="AspNetClientCapabilityProvider" type="Provider" version="09.07.00">
       <friendlyName>DotNetNuke ASP.NET Client Capability Provider</friendlyName>
       <description>ASP.NET Device Detection / Client Capability Provider</description>
       <iconFile>~/Providers/ClientCapabilityProviders/AspNetClientCapabilityProvider/Images/mobiledevicedet_32X32.png</iconFile>
diff --git a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn
index 07c06a779f1..d21a9ea97e4 100644
--- a/DNN Platform/Providers/FolderProviders/FolderProviders.dnn	
+++ b/DNN Platform/Providers/FolderProviders/FolderProviders.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DotNetNuke.Providers.FolderProviders" type="Provider" isSystem="true" version="09.06.02">
+    <package name="DotNetNuke.Providers.FolderProviders" type="Provider" isSystem="true" version="09.07.00">
       <friendlyName>DotNetNuke Folder Providers</friendlyName>
       <description>Azure Folder Providers for DotNetNuke.</description>
       <dependencies/>
diff --git a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn
index 59863f5baf6..b13e10b8d90 100644
--- a/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn	
+++ b/DNN Platform/Skins/Xcillion/DNN_Skin_Xcillion.dnn	
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="1.0">
   <packages>
-    <package name="Skin.Xcillion" type="Skin" version="09.06.02">
+    <package name="Skin.Xcillion" type="Skin" version="09.07.00">
       <friendlyName>Xcillion</friendlyName>
       <iconFile></iconFile>
       <description><![CDATA[A new default DNN skin]]></description>
@@ -29,7 +29,7 @@
         </component>
       </components>
     </package>
-    <package name="Container.Xcillion" type="Container" version="09.06.02">
+    <package name="Container.Xcillion" type="Container" version="09.07.00">
       <friendlyName>Xcillion</friendlyName>
       <iconFile></iconFile>
       <description><![CDATA[DNN container]]></description>
diff --git a/DNN Platform/Tests/App.config b/DNN Platform/Tests/App.config
index 7c68853518e..9da600bb752 100644
--- a/DNN Platform/Tests/App.config	
+++ b/DNN Platform/Tests/App.config	
@@ -30,6 +30,7 @@
       <section name="cryptography" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="databaseConnection" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="tokens" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
+      <section name="mail" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
     </sectionGroup>
     <section name="specFlow" type="TechTalk.SpecFlow.Configuration.ConfigurationSectionHandler, TechTalk.SpecFlow" />
   </configSections>
@@ -397,6 +398,12 @@
         <add name="CoreTokenProvider" type="DotNetNuke.Services.Tokens.CoreTokenProvider, DotNetNuke" />
       </providers>
     </tokens>
+    <mail defaultProvider="CoreMailProvider">
+      <providers>
+        <clear />
+        <add name="CoreMailProvider" type="DotNetNuke.Services.Mail.CoreMailProvider, DotNetNuke" />
+      </providers>
+    </mail>
   </dotnetnuke>
   <NUnit>
     <TestRunner>
diff --git a/DNN Platform/Website/DesktopModules/Admin/Security/EditUser.ascx.cs b/DNN Platform/Website/DesktopModules/Admin/Security/EditUser.ascx.cs
index db0611a5a43..b0cdbfbd5e8 100644
--- a/DNN Platform/Website/DesktopModules/Admin/Security/EditUser.ascx.cs	
+++ b/DNN Platform/Website/DesktopModules/Admin/Security/EditUser.ascx.cs	
@@ -292,6 +292,10 @@ protected void cmdUpdate_Click(object sender, EventArgs e)
                     // Clear the Portal Cache
                     DataCache.ClearPortalCache(this.UserPortalID, true);
                 }
+                else
+                {
+                    DataCache.ClearUserCache(this.PortalId, this.User.Username);
+                }
 
                 try
                 {
@@ -308,6 +312,14 @@ protected void cmdUpdate_Click(object sender, EventArgs e)
                         }
                     }
 
+                    var prevUserEmail = UserController.Instance.GetUserById(this.PortalId, this.UserId)?.Email;
+
+                    if (!string.IsNullOrWhiteSpace(prevUserEmail) && !prevUserEmail.Equals(this.User.Email, StringComparison.OrdinalIgnoreCase))
+                    {
+                        // on email address change need to invalidate existing 'reset password' link
+                        this.User.PasswordResetExpiration = Null.NullDate;
+                    }
+
                     UserController.UpdateUser(this.UserPortalID, this.User);
 
                     // make sure username matches possibly changed email address
diff --git a/DNN Platform/Website/development.config b/DNN Platform/Website/development.config
index e845aac347c..fb3f358981d 100644
--- a/DNN Platform/Website/development.config	
+++ b/DNN Platform/Website/development.config	
@@ -26,6 +26,7 @@
       <section name="cryptography" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="databaseConnection" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="tokens" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
+      <section name="mail" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
     </sectionGroup>
     <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
       <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
@@ -416,6 +417,12 @@
         <add name="CoreTokenProvider" type="DotNetNuke.Services.Tokens.CoreTokenProvider, DotNetNuke" />
       </providers>
     </tokens>
+    <mail defaultProvider="CoreMailProvider">
+      <providers>
+        <clear />
+        <add name="CoreMailProvider" type="DotNetNuke.Services.Mail.CoreMailProvider, DotNetNuke" />
+      </providers>
+    </mail>
   </dotnetnuke>
   <clientDependency version="0" fileDependencyExtensions=".js,.css">
     <fileRegistration defaultProvider="DnnPageHeaderProvider">
diff --git a/DNN Platform/Website/release.config b/DNN Platform/Website/release.config
index b0ebb33f3a6..1437ff75316 100644
--- a/DNN Platform/Website/release.config	
+++ b/DNN Platform/Website/release.config	
@@ -26,6 +26,7 @@
       <section name="cryptography" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="databaseConnection" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
       <section name="tokens" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
+      <section name="mail" requirePermission="false" type="DotNetNuke.Framework.Providers.ProviderConfigurationHandler, DotNetNuke" />
     </sectionGroup>
     <sectionGroup name="system.web.webPages.razor" type="System.Web.WebPages.Razor.Configuration.RazorWebSectionGroup, System.Web.WebPages.Razor">
       <section name="pages" type="System.Web.WebPages.Razor.Configuration.RazorPagesSection, System.Web.WebPages.Razor" requirePermission="false" />
@@ -417,6 +418,12 @@
         <add name="CoreTokenProvider" type="DotNetNuke.Services.Tokens.CoreTokenProvider, DotNetNuke" />
       </providers>
     </tokens>
+    <mail defaultProvider="CoreMailProvider">
+      <providers>
+        <clear />
+        <add name="CoreMailProvider" type="DotNetNuke.Services.Mail.CoreMailProvider, DotNetNuke" />
+      </providers>
+    </mail>
   </dotnetnuke>
   <clientDependency version="0" fileDependencyExtensions=".js,.css">
     <fileRegistration defaultProvider="DnnPageHeaderProvider">
diff --git a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
index cb917e6456d..ab137c12936 100644
--- a/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/AdminLogs.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "admin_logs",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-object-assign": "^7.0.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "8.0.6",
diff --git a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
index 90b45fdabea..ac16c6a8a0d 100644
--- a/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Bundle.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "export-bundle",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p --progress",
@@ -66,6 +66,6 @@
     "webpack-dev-server": "3.1.14"
   },
   "dependencies": {
-    "@dnnsoftware/dnn-react-common": "9.6.2"
+    "@dnnsoftware/dnn-react-common": "9.7.0"
   }
 }
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json
index 359abe9ec46..84b02eefa83 100644
--- a/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json
+++ b/Dnn.AdminExperience/ClientSide/Dnn.React.Common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@dnnsoftware/dnn-react-common",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": false,
   "description": "DNN React Component Library",
   "main": "dist/dnn-react-common.min.js",
diff --git a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json
index 2881238dc77..f9cb2c47744 100644
--- a/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Extensions.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "extensions",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -13,7 +13,7 @@
     "@babel/core": "^7.2.0",
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-object-assign": "6.22.0",
     "babel-plugin-transform-object-rest-spread": "6.26.0",
diff --git a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json
index f3b21c389cb..2e9cf6c487e 100644
--- a/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Licensing.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "licensing",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -13,7 +13,7 @@
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "8.0.6",
@@ -43,4 +43,4 @@
     "webpack-dev-server": "^3.1.14"
   },
   "dependencies": {}
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json
index b553597326a..83486a6faad 100644
--- a/Dnn.AdminExperience/ClientSide/Pages.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Pages.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pages",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "start": "npm run webpack",
@@ -23,7 +23,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "@types/knockout": "^3.4.66",
     "@types/redux": "3.6.31",
     "babel-eslint": "^10.0.1",
@@ -73,4 +73,4 @@
     "react-day-picker": "^7.2.4",
     "url-parse": "^1.2.0"
   }
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json
index f6e67328a76..2e6afef076d 100644
--- a/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Prompt.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "prompt",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "description": "DNN Prompt",
   "private": true,
   "scripts": {
@@ -15,7 +15,7 @@
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-eslint": "^10.0.1",
@@ -76,4 +76,4 @@
   "dependencies": {
     "html-react-parser": "^0.7.0"
   }
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json
index 6864c5bc3f5..427f56c8712 100644
--- a/Dnn.AdminExperience/ClientSide/Roles.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Roles.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "roles",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -13,7 +13,7 @@
     "@babel/core": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "^2.0.0",
     "array.prototype.findindex": "^2.0.0",
     "babel-loader": "^8.0.6",
diff --git a/Dnn.AdminExperience/ClientSide/Security.Web/package.json b/Dnn.AdminExperience/ClientSide/Security.Web/package.json
index f7ed2d379a8..d9e0c283643 100644
--- a/Dnn.AdminExperience/ClientSide/Security.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Security.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "security_settings",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-react-jsx": "^7.2.0",
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "create-react-class": "^15.6.3",
diff --git a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json
index 0563cfaefcf..61bbc6fba8e 100644
--- a/Dnn.AdminExperience/ClientSide/Seo.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Seo.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "seo",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "8.0.6",
@@ -47,4 +47,4 @@
     "webpack-dev-server": "^3.1.14"
   },
   "dependencies": {}
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json
index fd6981af11c..f829260e46a 100644
--- a/Dnn.AdminExperience/ClientSide/Servers.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Servers.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "servers",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "@types/redux": "^3.6.31",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-object-assign": "6.22.0",
@@ -46,4 +46,4 @@
   "dependencies": {
     "react-custom-scrollbars": "^4.1.1"
   }
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json
index cc2c958e567..799ef2f1f2e 100644
--- a/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/SiteGroups.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dnn-sitegroups",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-object-assign": "7.0.0",
     "@babel/preset-env": "7.1.6",
     "@babel/preset-react": "7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "babel-polyfill": "6.26.0",
diff --git a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json
index 6cdebde5c95..3ed7873cb94 100644
--- a/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/SiteImportExport.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "site_import_export",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-react-jsx": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-eslint": "^10.0.1",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-class-properties": "^6.22.0",
diff --git a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json
index 1422f172a6e..38d4bc96adb 100644
--- a/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/SiteSettings.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "site_settings",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-react-jsx": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "^8.0.6",
diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json
index 469c754982d..60df4b9f9d4 100644
--- a/Dnn.AdminExperience/ClientSide/Sites.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Sites.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "boilerplate",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-object-assign": "7.0.0",
     "@babel/preset-env": "7.1.6",
     "@babel/preset-react": "7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-react-remove-prop-types": "0.4.24",
     "babel-polyfill": "6.26.0",
diff --git a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json
index b924000ab37..fe74be173bc 100644
--- a/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json
+++ b/Dnn.AdminExperience/ClientSide/Sites.Web/src/_exportables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dnn-sites-list-view",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "description": "DNN Sites List View",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -15,7 +15,7 @@
     "@babel/plugin-transform-object-assign": "7.0.0",
     "@babel/preset-env": "7.1.6",
     "@babel/preset-react": "7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.4",
     "babel-plugin-transform-react-remove-prop-types": "0.4.20",
     "babel-polyfill": "6.26.0",
diff --git a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json
index eeee29e56a3..b06a78f5a85 100644
--- a/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/TaskScheduler.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "task_scheduler",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "8.0.6",
@@ -46,4 +46,4 @@
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.14"
   }
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json
index 2399c424737..def4ecd104d 100644
--- a/Dnn.AdminExperience/ClientSide/Themes.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Themes.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "themes",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
     "@babel/preset-env": "^7.2.0",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "babel-plugin-transform-object-assign": "6.22.0",
     "babel-plugin-transform-object-rest-spread": "6.26.0",
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/package.json
index 9d1fd68eda8..d10a892948f 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "users",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "start": "npm run webpack",
@@ -51,7 +51,7 @@
     "webpack-dev-server": "^3.1.14"
   },
   "dependencies": {
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "localization": "^1.0.2",
     "react-widgets": "^4.4.6"
   }
diff --git a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
index 8e5160b5f21..27afb7f3abc 100644
--- a/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
+++ b/Dnn.AdminExperience/ClientSide/Users.Web/src/_exportables/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dnn-users-exportables",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "description": "DNN Users Exportables",
   "scripts": {
     "start": "npm run webpack",
@@ -16,7 +16,7 @@
     "@babel/plugin-transform-react-jsx": "^7.1.6",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "babel-loader": "8.0.6",
     "create-react-class": "^15.6.3",
     "css-loader": "2.1.1",
diff --git a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
index 2c84059e49c..94a11e18516 100644
--- a/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
+++ b/Dnn.AdminExperience/ClientSide/Vocabularies.Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "taxonomy",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "scripts": {
     "build": "set NODE_ENV=production&&webpack -p",
@@ -14,7 +14,7 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.2.0",
     "@babel/preset-env": "^7.1.6",
     "@babel/preset-react": "^7.0.0",
-    "@dnnsoftware/dnn-react-common": "9.6.2",
+    "@dnnsoftware/dnn-react-common": "9.7.0",
     "array.prototype.find": "2.0.4",
     "array.prototype.findindex": "2.0.2",
     "babel-loader": "^8.0.6",
@@ -47,4 +47,4 @@
     "webpack-cli": "^3.1.2",
     "webpack-dev-server": "^3.1.14"
   }
-}
+}
\ No newline at end of file
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
index 1c307ee5c20..a1cd46c49ba 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Dnn.PersonaBar.Extensions.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.PersonaBar.Extensions" type="PersonaBar" version="09.06.02">
+        <package name="Dnn.PersonaBar.Extensions" type="PersonaBar" version="09.07.00">
             <friendlyName>Dnn.PersonaBar.Extensions</friendlyName>
             <description></description>
             <iconFile>~/Images/icon-personabarapp-32px.png</iconFile>
diff --git a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
index 3f2cbe8e141..34ed49641c9 100644
--- a/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
+++ b/Dnn.AdminExperience/Dnn.PersonaBar.Extensions/Services/PagesController.cs
@@ -36,60 +36,72 @@ namespace Dnn.PersonaBar.Pages.Services
     using DotNetNuke.Services.OutputCache;
     using DotNetNuke.Services.Social.Notifications;
     using DotNetNuke.Web.Api;
+    using DotNetNuke.Web.UI.WebControls;
 
     using Localization = Dnn.PersonaBar.Pages.Components.Localization;
 
+    /// <summary>
+    /// API controller for the Pages persona bar module.
+    /// </summary>
     [MenuPermission(MenuName = "Dnn.Pages")]
     [DnnExceptionFilter]
     public class PagesController : PersonaBarApiController
     {
         private const string LocalResourceFile = Library.Constants.PersonaBarRelativePath + "Modules/Dnn.Pages/App_LocalResources/Pages.resx";
         private static readonly ILog Logger = LoggerSource.Instance.GetLogger(typeof(PagesController));
-        private readonly IPagesController _pagesController;
-        private readonly IBulkPagesController _bulkPagesController;
-        private readonly IThemesController _themesController;
-        private readonly ITemplateController _templateController;
-        private readonly IDefaultPortalThemeController _defaultPortalThemeController;
+        private readonly IPagesController pagesController;
 
-        private readonly ITabController _tabController;
-        private readonly ILocaleController _localeController;
-        private readonly ISecurityService _securityService;
+        private readonly IBulkPagesController bulkPagesController;
+        private readonly IThemesController themesController;
+        private readonly ITemplateController templateController;
+        private readonly IDefaultPortalThemeController defaultPortalThemeController;
 
+        private readonly ITabController tabController;
+        private readonly ILocaleController localeController;
+        private readonly ISecurityService securityService;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="PagesController"/> class.
+        /// </summary>
+        /// <param name="navigationManager">the navigation manager to provide navigation features.</param>
         public PagesController(INavigationManager navigationManager)
         {
             this.NavigationManager = navigationManager;
 
-            this._pagesController = Components.PagesController.Instance;
-            this._themesController = ThemesController.Instance;
-            this._bulkPagesController = BulkPagesController.Instance;
-            this._templateController = TemplateController.Instance;
-            this._defaultPortalThemeController = DefaultPortalThemeController.Instance;
+            this.pagesController = Components.PagesController.Instance;
+            this.themesController = ThemesController.Instance;
+            this.bulkPagesController = BulkPagesController.Instance;
+            this.templateController = TemplateController.Instance;
+            this.defaultPortalThemeController = DefaultPortalThemeController.Instance;
 
-            this._tabController = TabController.Instance;
-            this._localeController = LocaleController.Instance;
-            this._securityService = SecurityService.Instance;
+            this.tabController = TabController.Instance;
+            this.localeController = LocaleController.Instance;
+            this.securityService = SecurityService.Instance;
         }
 
+        /// <summary>
+        /// Gets the Navigation Manager that provides navigation features.
+        /// </summary>
         protected INavigationManager NavigationManager { get; }
 
         /// GET: api/Pages/GetPageDetails
         /// <summary>
         /// Get detail of a page.
         /// </summary>
-        /// <param name="pageId"></param>
-        /// <returns></returns>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>The page details.</returns>
         [HttpGet]
         public HttpResponseMessage GetPageDetails(int pageId)
         {
-            if (!this._securityService.CanManagePage(pageId))
+            if (!this.securityService.CanManagePage(pageId))
             {
                 return this.GetForbiddenResponse();
             }
 
             try
             {
-                var page = this._pagesController.GetPageSettings(pageId);
-                return this.Request.CreateResponse(HttpStatusCode.OK, page);
+                var page = this.pagesController.GetPageSettings(pageId);
+                return this.Request.CreateResponse(HttpStatusCode.OK, new { page, new DnnFileUploadOptions().ValidationCode });
             }
             catch (PageNotFoundException)
             {
@@ -101,77 +113,93 @@ public HttpResponseMessage GetPageDetails(int pageId)
         /// <summary>
         /// Get custom Urls of a page.
         /// </summary>
-        /// <param name="pageId"></param>
-        /// <returns></returns>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>A list of custom urls.</returns>
         [HttpGet]
         public HttpResponseMessage GetCustomUrls(int pageId)
         {
-            if (!this._securityService.CanManagePage(pageId))
+            if (!this.securityService.CanManagePage(pageId))
             {
                 return this.GetForbiddenResponse();
             }
 
-            return this.Request.CreateResponse(HttpStatusCode.OK, this._pagesController.GetPageUrls(pageId));
+            return this.Request.CreateResponse(HttpStatusCode.OK, this.pagesController.GetPageUrls(pageId));
         }
 
+        /// <summary>
+        /// Creates a custom url for SEO purposes.
+        /// </summary>
+        /// <param name="dto"><see cref="SeoUrl"/> DTO.</param>
+        /// <returns>Information about success or failure as well as a possible error message and a new url suggestion.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage CreateCustomUrl(SeoUrl dto)
         {
-            if (!this._securityService.CanManagePage(dto.TabId))
+            if (!this.securityService.CanManagePage(dto.TabId))
             {
                 return this.GetForbiddenResponse();
             }
 
-            var result = this._pagesController.CreateCustomUrl(dto);
+            var result = this.pagesController.CreateCustomUrl(dto);
 
-            return this.Request.CreateResponse(HttpStatusCode.OK,
-                                new
-                                {
-                                    result.Id,
-                                    result.Success,
-                                    result.ErrorMessage,
-                                    result.SuggestedUrlPath
-                                });
+            return this.Request.CreateResponse(
+                HttpStatusCode.OK,
+                new
+                {
+                    result.Id,
+                    result.Success,
+                    result.ErrorMessage,
+                    result.SuggestedUrlPath,
+                });
         }
 
+        /// <summary>
+        /// Updates a custom url.
+        /// </summary>
+        /// <param name="dto"><see cref="SeoUrl"/> DTO.</param>
+        /// <returns>the id, if the call succeeded or faile, a possible error message and a possible new url suggestion.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage UpdateCustomUrl(SeoUrl dto)
         {
-            if (!this._securityService.CanManagePage(dto.TabId))
+            if (!this.securityService.CanManagePage(dto.TabId))
             {
                 return this.GetForbiddenResponse();
             }
 
-            var result = this._pagesController.UpdateCustomUrl(dto);
+            var result = this.pagesController.UpdateCustomUrl(dto);
 
             return this.Request.CreateResponse(HttpStatusCode.OK, new
             {
                 result.Id,
                 result.Success,
                 result.ErrorMessage,
-                result.SuggestedUrlPath
+                result.SuggestedUrlPath,
             });
         }
 
+        /// <summary>
+        /// Deletes a custom URL.
+        /// </summary>
+        /// <param name="dto"><see cref="UrlIdDto"/> DTO.</param>
+        /// <returns>A value indicating if the call succeeded.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage DeleteCustomUrl(UrlIdDto dto)
         {
-            if (!this._securityService.CanManagePage(dto.TabId))
+            if (!this.securityService.CanManagePage(dto.TabId))
             {
                 return this.GetForbiddenResponse();
             }
 
-            this._pagesController.DeleteCustomUrl(dto);
+            this.pagesController.DeleteCustomUrl(dto);
 
             var response = new
             {
-                Success = true
+                Success = true,
             };
 
             return this.Request.CreateResponse(HttpStatusCode.OK, response);
@@ -179,63 +207,75 @@ public HttpResponseMessage DeleteCustomUrl(UrlIdDto dto)
 
         /// GET: api/Pages/GetPageList
         /// <summary>
-        /// 
+        /// Gets the list of pages for a given parent page.
         /// </summary>
-        /// <param name="parentId"></param>
-        /// <param name="searchKey"></param>
-        /// <returns></returns>
+        /// <param name="parentId">The page (tab) id for the parent.</param>
+        /// <param name="searchKey">An optional search string.</param>
+        /// <returns>A list of pages.</returns>
         [HttpGet]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "VIEW_PAGE_LIST,VIEW")]
         public HttpResponseMessage GetPageList(int parentId = -1, string searchKey = "")
-
         {
             var adminTabId = this.PortalSettings.AdminTabId;
             var tabs = TabController.GetPortalTabs(this.PortalSettings.PortalId, adminTabId, false, true, false, true);
-            var pages = from p in this._pagesController.GetPageList(this.PortalSettings, parentId, searchKey)
+            var pages = from p in this.pagesController.GetPageList(this.PortalSettings, parentId, searchKey)
                         select Converters.ConvertToPageItem<PageItem>(p, tabs);
             return this.Request.CreateResponse(HttpStatusCode.OK, pages);
         }
 
         /// GET: api/Pages/SearchPages
         /// <summary>
-        /// 
+        /// Searches for pages.
         /// </summary>
-        /// <param name="searchKey"></param>
-        /// <param name="pageType"></param>
-        /// <param name="tags"></param>
-        /// <param name="publishStatus"></param>
-        /// <param name="publishDateStart"></param>
-        /// <param name="publishDateEnd"></param>
-        /// <param name="workflowId"></param>
-        /// <param name="pageIndex"></param>
-        /// <param name="pageSize"></param>
-        /// <returns></returns>
+        /// <param name="searchKey">The search string.</param>
+        /// <param name="pageType">The type of page.</param>
+        /// <param name="tags">The page tags.</param>
+        /// <param name="publishStatus">The publish status of the page.</param>
+        /// <param name="publishDateStart">The publish start date.</param>
+        /// <param name="publishDateEnd">The publish end date.</param>
+        /// <param name="workflowId">The workflow id for the page.</param>
+        /// <param name="pageIndex">What index of the pages paging to return.</param>
+        /// <param name="pageSize">How many pages to return per paging page.</param>
+        /// <returns>Paged list of pages.</returns>
         [HttpGet]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "VIEW_PAGE_LIST,VIEW")]
-        public HttpResponseMessage SearchPages(string searchKey = "", string pageType = "", string tags = "", string publishStatus = "All",
-            string publishDateStart = "", string publishDateEnd = "", int workflowId = -1, int pageIndex = -1, int pageSize = -1)
+        public HttpResponseMessage SearchPages(
+            string searchKey = "",
+            string pageType = "",
+            string tags = "",
+            string publishStatus = "All",
+            string publishDateStart = "",
+            string publishDateEnd = "",
+            int workflowId = -1,
+            int pageIndex = -1,
+            int pageSize = -1)
         {
             int totalRecords;
             var adminTabId = this.PortalSettings.AdminTabId;
             var tabs = TabController.GetPortalTabs(this.PortalSettings.PortalId, adminTabId, false, true, false, true);
-            var pages = from p in this._pagesController.SearchPages(out totalRecords, searchKey, pageType, tags, publishStatus, publishDateStart, publishDateEnd, workflowId, pageIndex, pageSize)
+            var pages = from p in this.pagesController.SearchPages(out totalRecords, searchKey, pageType, tags, publishStatus, publishDateStart, publishDateEnd, workflowId, pageIndex, pageSize)
                         select Converters.ConvertToPageItem<PageItem>(p, tabs);
             var response = new
             {
                 Success = true,
                 Results = pages,
-                TotalResults = totalRecords
+                TotalResults = totalRecords,
             };
             return this.Request.CreateResponse(HttpStatusCode.OK, response);
         }
 
+        /// <summary>
+        /// Gets the pages hierarchy.
+        /// </summary>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>The page hyerarchy.</returns>
         [HttpGet]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage GetPageHierarchy(int pageId)
         {
             try
             {
-                var paths = this._pagesController.GetPageHierarchy(pageId);
+                var paths = this.pagesController.GetPageHierarchy(pageId);
                 return this.Request.CreateResponse(HttpStatusCode.OK, paths);
             }
             catch (PageNotFoundException)
@@ -244,24 +284,33 @@ public HttpResponseMessage GetPageHierarchy(int pageId)
             }
         }
 
+        /// <summary>
+        /// Moves a page to another place in the hierarchy.
+        /// </summary>
+        /// <param name="request"><see cref="PageMoveRequest"/> DTO.</param>
+        /// <returns>A status and information about the page at it's new location.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage MovePage(PageMoveRequest request)
         {
-
-            if (!this._securityService.CanManagePage(request.PageId)
-                || !this._securityService.CanManagePage(request.ParentId)
-                || !this._securityService.CanManagePage(request.RelatedPageId)
-                || !this._securityService.CanManagePage(TabController.Instance.GetTab(request.RelatedPageId, this.PortalId)?.ParentId ?? -1))
+            if (!this.securityService.CanManagePage(request.PageId)
+                || !this.securityService.CanManagePage(request.ParentId)
+                || !this.securityService.CanManagePage(request.RelatedPageId)
+                || !this.securityService.CanManagePage(TabController.Instance.GetTab(request.RelatedPageId, this.PortalId)?.ParentId ?? -1))
             {
                 return this.GetForbiddenResponse();
             }
 
             try
             {
-                var tab = this._pagesController.MovePage(request);
-                var tabs = TabController.GetPortalTabs(this.PortalSettings.PortalId, Null.NullInteger, false, true, false,
+                var tab = this.pagesController.MovePage(request);
+                var tabs = TabController.GetPortalTabs(
+                    this.PortalSettings.PortalId,
+                    Null.NullInteger,
+                    false,
+                    true,
+                    false,
                     true);
                 var pageItem = Converters.ConvertToPageItem<PageItem>(tab, tabs);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Status = 0, Page = pageItem });
@@ -276,41 +325,51 @@ public HttpResponseMessage MovePage(PageMoveRequest request)
             }
         }
 
+        /// <summary>
+        /// Deletes a page.
+        /// </summary>
+        /// <param name="page">The page to delete, <see cref="PageItem"/> DTO.</param>
+        /// <param name="hardDelete">Should the page be hard-deleted or not.</param>
+        /// <returns>The status of the page deletion.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage DeletePage(PageItem page, [FromUri] bool hardDelete = false)
         {
-            if (!this._securityService.CanDeletePage(page.Id))
+            if (!this.securityService.CanDeletePage(page.Id))
             {
                 return this.GetForbiddenResponse();
             }
 
             try
             {
-                this._pagesController.DeletePage(page, hardDelete, this.PortalSettings);
+                this.pagesController.DeletePage(page, hardDelete, this.PortalSettings);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Status = 0 });
             }
             catch (PageNotFoundException)
             {
-
                 return this.Request.CreateResponse(HttpStatusCode.NotFound);
             }
         }
 
+        /// <summary>
+        /// Deletes a module from a page.
+        /// </summary>
+        /// <param name="module">The module to delete, <see cref="PageModuleItem"/> DTO.</param>
+        /// <returns>A status code or an error.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage DeletePageModule(PageModuleItem module)
         {
-            if (!this._securityService.CanManagePage(module.PageId))
+            if (!this.securityService.CanManagePage(module.PageId))
             {
                 return this.GetForbiddenResponse();
             }
 
             try
             {
-                this._pagesController.DeleteTabModule(module.PageId, module.ModuleId);
+                this.pagesController.DeleteTabModule(module.PageId, module.ModuleId);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Status = 0 });
             }
             catch (PageModuleNotFoundException)
@@ -319,33 +378,43 @@ public HttpResponseMessage DeletePageModule(PageModuleItem module)
             }
         }
 
+        /// <summary>
+        /// Copies the theme from a page to descendend pages.
+        /// </summary>
+        /// <param name="copyTheme"><see cref="CopyThemeRequest"/>.</param>
+        /// <returns>The status of the request.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage CopyThemeToDescendantPages(CopyThemeRequest copyTheme)
         {
-            if (!this._securityService.CanManagePage(copyTheme.PageId))
+            if (!this.securityService.CanManagePage(copyTheme.PageId))
             {
                 return this.GetForbiddenResponse();
             }
 
-            this._pagesController.CopyThemeToDescendantPages(copyTheme.PageId, copyTheme.Theme);
+            this.pagesController.CopyThemeToDescendantPages(copyTheme.PageId, copyTheme.Theme);
             return this.Request.CreateResponse(HttpStatusCode.OK, new { Status = 0 });
         }
 
+        /// <summary>
+        /// Copies permissions from a page to the descendent pages.
+        /// </summary>
+        /// <param name="copyPermissions"><see cref="CopyPermissionsRequest"/> DTO.</param>
+        /// <returns>The status of the operation.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage CopyPermissionsToDescendantPages(CopyPermissionsRequest copyPermissions)
         {
-            if (!this._securityService.CanAdminPage(copyPermissions.PageId))
+            if (!this.securityService.CanAdminPage(copyPermissions.PageId))
             {
                 return this.GetForbiddenResponse();
             }
 
             try
             {
-                this._pagesController.CopyPermissionsToDescendantPages(copyPermissions.PageId);
+                this.pagesController.CopyPermissionsToDescendantPages(copyPermissions.PageId);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Status = 0 });
             }
             catch (PageNotFoundException)
@@ -358,6 +427,11 @@ public HttpResponseMessage CopyPermissionsToDescendantPages(CopyPermissionsReque
             }
         }
 
+        /// <summary>
+        /// Sets a page in edit mode.
+        /// </summary>
+        /// <param name="id">the page (tab) id.</param>
+        /// <returns>Sets a cookie for edit mode on the specified page then returns a success message.</returns>
         [HttpPost]
         public HttpResponseMessage EditModeForPage([FromUri] int id)
         {
@@ -366,15 +440,20 @@ public HttpResponseMessage EditModeForPage([FromUri] int id)
                 return this.GetForbiddenResponse();
             }
 
-            this._pagesController.EditModeForPage(id, this.UserInfo.UserID);
+            this.pagesController.EditModeForPage(id, this.UserInfo.UserID);
             return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
         }
 
+        /// <summary>
+        /// Saves the page details.
+        /// </summary>
+        /// <param name="pageSettings">The new page settings, <see cref="PageSettings"/> DTO.</param>
+        /// <returns>The new page details.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         public HttpResponseMessage SavePageDetails(PageSettings pageSettings)
         {
-            if (!this._securityService.CanSavePageDetails(pageSettings))
+            if (!this.securityService.CanSavePageDetails(pageSettings))
             {
                 return this.GetForbiddenResponse();
             }
@@ -382,14 +461,19 @@ public HttpResponseMessage SavePageDetails(PageSettings pageSettings)
             try
             {
                 pageSettings.Clean();
-                var tab = this._pagesController.SavePageDetails(this.PortalSettings, pageSettings);
-                var tabs = TabController.GetPortalTabs(this.PortalSettings.PortalId, Null.NullInteger, false, true, false,
+                var tab = this.pagesController.SavePageDetails(this.PortalSettings, pageSettings);
+                var tabs = TabController.GetPortalTabs(
+                    this.PortalSettings.PortalId,
+                    Null.NullInteger,
+                    false,
+                    true,
+                    false,
                     true);
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, new
                 {
                     Status = 0,
-                    Page = Converters.ConvertToPageItem<PageItem>(tab, tabs)
+                    Page = Converters.ConvertToPageItem<PageItem>(tab, tabs),
                 });
             }
             catch (PageNotFoundException)
@@ -402,13 +486,22 @@ public HttpResponseMessage SavePageDetails(PageSettings pageSettings)
             }
         }
 
+        /// <summary>
+        /// Gets the default page settings.
+        /// </summary>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>The page default settings.</returns>
         [HttpGet]
         public HttpResponseMessage GetDefaultSettings(int pageId = 0)
         {
-            var settings = this._pagesController.GetDefaultSettings(pageId);
-            return this.Request.CreateResponse(HttpStatusCode.OK, settings);
+            var settings = this.pagesController.GetDefaultSettings(pageId);
+            return this.Request.CreateResponse(HttpStatusCode.OK, new { page = settings, new DnnFileUploadOptions().ValidationCode });
         }
 
+        /// <summary>
+        /// Gets the list of cache providers.
+        /// </summary>
+        /// <returns>List of cache providers.</returns>
         [HttpGet]
         public HttpResponseMessage GetCacheProviderList()
         {
@@ -416,16 +509,20 @@ public HttpResponseMessage GetCacheProviderList()
             return this.Request.CreateResponse(HttpStatusCode.OK, providers);
         }
 
+        /// <summary>
+        /// Gets the available themes.
+        /// </summary>
+        /// <returns>Available themes.</returns>
         [HttpGet]
         public HttpResponseMessage GetThemes()
         {
-            var themes = this._themesController.GetLayouts(this.PortalSettings, ThemeLevel.All);
+            var themes = this.themesController.GetLayouts(this.PortalSettings, ThemeLevel.All);
 
             var defaultTheme = this.GetDefaultPortalTheme();
             var defaultPortalThemeName = defaultTheme?.ThemeName;
             var defaultPortalThemeLevel = defaultTheme?.Level;
-            var defaultPortalLayout = this._defaultPortalThemeController.GetDefaultPortalLayout();
-            var defaultPortalContainer = this._defaultPortalThemeController.GetDefaultPortalContainer();
+            var defaultPortalLayout = this.defaultPortalThemeController.GetDefaultPortalLayout();
+            var defaultPortalContainer = this.defaultPortalThemeController.GetDefaultPortalContainer();
 
             return this.Request.CreateResponse(HttpStatusCode.OK, new
             {
@@ -433,31 +530,42 @@ public HttpResponseMessage GetThemes()
                 defaultPortalThemeName,
                 defaultPortalThemeLevel,
                 defaultPortalLayout,
-                defaultPortalContainer
+                defaultPortalContainer,
             });
         }
 
+        /// <summary>
+        /// Gets the theme files for a given theme.
+        /// </summary>
+        /// <param name="themeName">The name of the theme.</param>
+        /// <param name="level">The level of the theme, <see cref="ThemeLevel"/>.</param>
+        /// <returns>Returns a list of available layouts and containers for each theme.</returns>
         [HttpGet]
         public HttpResponseMessage GetThemeFiles(string themeName, ThemeLevel level)
         {
-            var themeLayout = this._themesController.GetLayouts(this.PortalSettings, level)
+            var themeLayout = this.themesController.GetLayouts(this.PortalSettings, level)
                 .FirstOrDefault(t => t.PackageName.Equals(themeName, StringComparison.OrdinalIgnoreCase) && t.Level == level);
-            var themeContainer = this._themesController.GetContainers(this.PortalSettings, level)
+            var themeContainer = this.themesController.GetContainers(this.PortalSettings, level)
                 .FirstOrDefault(t => t.PackageName.Equals(themeName, StringComparison.OrdinalIgnoreCase) && t.Level == level);
 
             return this.Request.CreateResponse(HttpStatusCode.OK, new
             {
-                layouts = themeLayout == null ? new List<ThemeFileInfo>() : this._themesController.GetThemeFiles(this.PortalSettings, themeLayout),
-                containers = themeContainer == null ? new List<ThemeFileInfo>() : this._themesController.GetThemeFiles(this.PortalSettings, themeContainer)
+                layouts = themeLayout == null ? new List<ThemeFileInfo>() : this.themesController.GetThemeFiles(this.PortalSettings, themeLayout),
+                containers = themeContainer == null ? new List<ThemeFileInfo>() : this.themesController.GetThemeFiles(this.PortalSettings, themeContainer),
             });
         }
 
+        /// <summary>
+        /// Save bulk pages (Add multiple pages).
+        /// </summary>
+        /// <param name="bulkPage"><see cref="BulkPage"/> DTO.</param>
+        /// <returns>A status code and the result of adding the multiple pages.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage SaveBulkPages(BulkPage bulkPage)
         {
-            if (!this._securityService.IsPageAdminUser())
+            if (!this.securityService.IsPageAdminUser())
             {
                 return this.GetForbiddenResponse();
             }
@@ -465,12 +573,12 @@ public HttpResponseMessage SaveBulkPages(BulkPage bulkPage)
             try
             {
                 bulkPage.Clean();
-                var bulkPageResponse = this._bulkPagesController.AddBulkPages(bulkPage, validateOnly: false);
+                var bulkPageResponse = this.bulkPagesController.AddBulkPages(bulkPage, validateOnly: false);
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, new
                 {
                     Status = 0,
-                    Response = bulkPageResponse
+                    Response = bulkPageResponse,
                 });
             }
             catch (PageValidationException ex)
@@ -479,12 +587,17 @@ public HttpResponseMessage SaveBulkPages(BulkPage bulkPage)
             }
         }
 
+        /// <summary>
+        /// Validates if bulk pages (Add multiple pages) information is valid.
+        /// </summary>
+        /// <param name="bulkPage"><see cref="BulkPage"/> DTO.</param>
+        /// <returns>A status code and the result of the bulk pages check.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage PreSaveBulkPagesValidate(BulkPage bulkPage)
         {
-            if (!this._securityService.IsPageAdminUser())
+            if (!this.securityService.IsPageAdminUser())
             {
                 return this.GetForbiddenResponse();
             }
@@ -492,12 +605,12 @@ public HttpResponseMessage PreSaveBulkPagesValidate(BulkPage bulkPage)
             try
             {
                 bulkPage.Clean();
-                var bulkPageResponse = this._bulkPagesController.AddBulkPages(bulkPage, validateOnly: true);
+                var bulkPageResponse = this.bulkPagesController.AddBulkPages(bulkPage, validateOnly: true);
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, new
                 {
                     Status = 0,
-                    Response = bulkPageResponse
+                    Response = bulkPageResponse,
                 });
             }
             catch (PageValidationException ex)
@@ -506,12 +619,17 @@ public HttpResponseMessage PreSaveBulkPagesValidate(BulkPage bulkPage)
             }
         }
 
+        /// <summary>
+        /// Saves a page as a template.
+        /// </summary>
+        /// <param name="pageTemplate"><see cref="PageTemplate"/> DTO.</param>
+        /// <returns>The status of the operation with a possible error message.</returns>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
         public HttpResponseMessage SavePageAsTemplate(PageTemplate pageTemplate)
         {
-            if (!this._securityService.CanExportPage(pageTemplate.TabId))
+            if (!this.securityService.CanExportPage(pageTemplate.TabId))
             {
                 return this.GetForbiddenResponse();
             }
@@ -519,13 +637,13 @@ public HttpResponseMessage SavePageAsTemplate(PageTemplate pageTemplate)
             try
             {
                 pageTemplate.Clean();
-                var templateFilename = this._templateController.SaveAsTemplate(pageTemplate);
+                var templateFilename = this.templateController.SaveAsTemplate(pageTemplate);
                 var response = string.Format(Localization.GetString("ExportedMessage"), templateFilename);
 
                 return this.Request.CreateResponse(HttpStatusCode.OK, new
                 {
                     Status = 0,
-                    Response = response
+                    Response = response,
                 });
             }
             catch (TemplateException ex)
@@ -534,10 +652,12 @@ public HttpResponseMessage SavePageAsTemplate(PageTemplate pageTemplate)
             }
         }
 
-        // From inside Visual Studio editor press [CTRL]+[M] then [O] to collapse source code to definition
-        // From inside Visual Studio editor press [CTRL]+[M] then [P] to expand source code folding
-
-        // POST /api/personabar/pages/MakePageNeutral?tabId=123
+        /// <summary>
+        /// Makes a localized pages neutral.
+        /// </summary>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>A success status or an exception.</returns>
+        /// <example>POST /api/personabar/pages/MakePageNeutral?tabId=123 .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -545,28 +665,34 @@ public HttpResponseMessage MakePageNeutral([FromUri] int pageId)
         {
             try
             {
-                if (!this._securityService.CanManagePage(pageId))
+                if (!this.securityService.CanManagePage(pageId))
                 {
                     return this.GetForbiddenResponse();
                 }
 
-                if (this._tabController.GetTabsByPortal(this.PortalId).WithParentId(pageId).Count > 0)
+                if (this.tabController.GetTabsByPortal(this.PortalId).WithParentId(pageId).Count > 0)
                 {
                     return this.Request.CreateErrorResponse(HttpStatusCode.BadRequest, LocalizeString("MakeNeutral.ErrorMessage"));
                 }
 
-                var defaultLocale = this._localeController.GetDefaultLocale(this.PortalId);
-                this._tabController.ConvertTabToNeutralLanguage(this.PortalId, pageId, defaultLocale.Code, true);
+                var defaultLocale = this.localeController.GetDefaultLocale(this.PortalId);
+                this.tabController.ConvertTabToNeutralLanguage(this.PortalId, pageId, defaultLocale.Code, true);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to make this page neutral, please consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/MakePageTranslatable?tabId=123
+        /// <summary>
+        /// Makes a neutral page localizable.
+        /// </summary>
+        /// <param name="pageId">the page (tab) id.</param>
+        /// <returns>A status code or an error message.</returns>
+        /// <example>POST /api/personabar/pages/MakePageTranslatable?tabId=123 .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -574,31 +700,37 @@ public HttpResponseMessage MakePageTranslatable([FromUri] int pageId)
         {
             try
             {
-                if (!this._securityService.CanManagePage(pageId))
+                if (!this.securityService.CanManagePage(pageId))
                 {
                     return this.GetForbiddenResponse();
                 }
 
-                var currentTab = this._tabController.GetTab(pageId, this.PortalId, false);
+                var currentTab = this.tabController.GetTab(pageId, this.PortalId, false);
                 if (currentTab == null)
                 {
                     return this.Request.CreateErrorResponse(HttpStatusCode.BadRequest, "InvalidTab");
                 }
 
-                var defaultLocale = this._localeController.GetDefaultLocale(this.PortalId);
-                this._tabController.LocalizeTab(currentTab, defaultLocale, true);
-                this._tabController.AddMissingLanguages(this.PortalId, pageId);
-                this._tabController.ClearCache(this.PortalId);
+                var defaultLocale = this.localeController.GetDefaultLocale(this.PortalId);
+                this.tabController.LocalizeTab(currentTab, defaultLocale, true);
+                this.tabController.AddMissingLanguages(this.PortalId, pageId);
+                this.tabController.ClearCache(this.PortalId);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to make this page translatable.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/AddMissingLanguages?tabId=123
+        /// <summary>
+        /// Adds all missing languages to a page.
+        /// </summary>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>A status code or an exception message.</returns>
+        /// <example>POST /api/personabar/pages/AddMissingLanguages?tabId=123 .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -606,23 +738,29 @@ public HttpResponseMessage AddMissingLanguages([FromUri] int pageId)
         {
             try
             {
-                if (!this._securityService.CanManagePage(pageId))
+                if (!this.securityService.CanManagePage(pageId))
                 {
                     return this.GetForbiddenResponse();
                 }
 
-                this._tabController.AddMissingLanguages(this.PortalId, pageId);
-                this._tabController.ClearCache(this.PortalId);
+                this.tabController.AddMissingLanguages(this.PortalId, pageId);
+                this.tabController.ClearCache(this.PortalId);
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true });
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to add missing languages to this page, consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/NotifyTranslators
+        /// <summary>
+        /// Notifies the translators with a comment.
+        /// </summary>
+        /// <param name="comment"><see cref="TranslatorsComment"/> DTO.</param>
+        /// <returns>A status code and a message.</returns>
+        /// <example>POST /api/personabar/pages/NotifyTranslators .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -630,21 +768,21 @@ public HttpResponseMessage NotifyTranslators(TranslatorsComment comment)
         {
             try
             {
-                if (!this._securityService.CanManagePage(comment.TabId))
+                if (!this.securityService.CanManagePage(comment.TabId))
                 {
                     return this.GetForbiddenResponse();
                 }
 
                 // loop through all localized version of this page
-                var currentTab = this._tabController.GetTab(comment.TabId, this.PortalId, false);
+                var currentTab = this.tabController.GetTab(comment.TabId, this.PortalId, false);
                 foreach (var localizedTab in currentTab.LocalizedTabs.Values)
                 {
                     var users = new Dictionary<int, UserInfo>();
 
-                    //Give default translators for this language and administrators permissions
-                    this._tabController.GiveTranslatorRoleEditRights(localizedTab, users);
+                    // Give default translators for this language and administrators permissions
+                    this.tabController.GiveTranslatorRoleEditRights(localizedTab, users);
 
-                    //Send Messages to all the translators of new content
+                    // Send Messages to all the translators of new content
                     foreach (var translator in users.Values.Where(user => user.UserID != this.PortalSettings.AdministratorId))
                     {
                         this.AddTranslationSubmittedNotification(localizedTab, translator, comment.Text);
@@ -656,45 +794,53 @@ public HttpResponseMessage NotifyTranslators(TranslatorsComment comment)
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to notify the translators, please consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // GET /api/personabar/pages/GetTabLocalization?pageId=123
         /// <summary>
         /// Gets the view data that used to be in the old ControlBar's localization tab
         /// under Page Settings ( /{page}/ctl/Tab/action/edit/activeTab/settingTab ).
         /// </summary>
         /// <param name="pageId">The ID of the tab to get localization for.</param>
-        /// <returns></returns>
+        /// <returns>Information about localiz.</returns>
+        /// <example>/api/personabar/pages/GetTabLocalization?pageId=123.</example>
         [HttpGet]
         public HttpResponseMessage GetTabLocalization(int pageId)
         {
             try
             {
-                if (!this._securityService.CanManagePage(pageId))
+                if (!this.securityService.CanManagePage(pageId))
                 {
                     return this.GetForbiddenResponse();
                 }
 
-                var currentTab = this._tabController.GetTab(pageId, this.PortalId, false);
+                var currentTab = this.tabController.GetTab(pageId, this.PortalId, false);
                 var locales = new List<LocaleInfoDto>();
                 var pages = new DnnPagesDto(locales);
                 if (!currentTab.IsNeutralCulture)
                 {
                     pages = this.GetNonLocalizedPages(pageId);
                 }
+
                 return this.Request.CreateResponse(HttpStatusCode.OK, pages);
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurrfed trying to get this page localization, consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/UpdateTabLocalization
+        /// <summary>
+        /// Updates the page (tab) localization.
+        /// </summary>
+        /// <param name="request"><see cref="DnnPagesRequest"/> DTO.</param>
+        /// <returns>A status code or an exception message.</returns>
+        /// <example>POST /api/personabar/pages/UpdateTabLocalization .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -702,7 +848,7 @@ public HttpResponseMessage UpdateTabLocalization(DnnPagesRequest request)
         {
             try
             {
-                if (request.Pages.Any(x => x.TabId > 0 && !this._securityService.CanManagePage(x.TabId)))
+                if (request.Pages.Any(x => x.TabId > 0 && !this.securityService.CanManagePage(x.TabId)))
                 {
                     return this.GetForbiddenResponse();
                 }
@@ -712,12 +858,18 @@ public HttpResponseMessage UpdateTabLocalization(DnnPagesRequest request)
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred trying to update the page localization, please consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/RestoreModule?tabModuleId=123
+        /// <summary>
+        /// Restores a deleted module on a page (tab).
+        /// </summary>
+        /// <param name="tabModuleId">The TabModule id.</param>
+        /// <returns>A success message or an exception message.</returns>
+        /// <example>POST /api/personabar/pages/RestoreModule?tabModuleId=123 .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -726,7 +878,7 @@ public HttpResponseMessage RestoreModule(int tabModuleId)
             try
             {
                 var module = ModuleController.Instance.GetTabModule(tabModuleId);
-                if (!this._securityService.CanManagePage(module.TabID))
+                if (!this.securityService.CanManagePage(module.TabID))
                 {
                     return this.GetForbiddenResponse();
                 }
@@ -743,12 +895,18 @@ public HttpResponseMessage RestoreModule(int tabModuleId)
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to restore the module onto that page.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/DeleteModule?tabModuleId=123
+        /// <summary>
+        /// Deletes a module from a page (tab).
+        /// </summary>
+        /// <param name="tabModuleId">The TabModuleId.</param>
+        /// <returns>A status message or an error message.</returns>
+        /// <example>POST /api/personabar/pages/DeleteModule?tabModuleId=123 .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -757,7 +915,7 @@ public HttpResponseMessage DeleteModule(int tabModuleId)
             try
             {
                 var module = ModuleController.Instance.GetTabModule(tabModuleId);
-                if (!this._securityService.CanManagePage(module.TabID))
+                if (!this.securityService.CanManagePage(module.TabID))
                 {
                     return this.GetForbiddenResponse();
                 }
@@ -774,16 +932,17 @@ public HttpResponseMessage DeleteModule(int tabModuleId)
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to delete the module, consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // GET /api/personabar/pages/GetContentLocalizationEnabled
         /// <summary>
-        /// Gets ContentLocalizationEnabled. 
+        /// Gets ContentLocalizationEnabled.
         /// </summary>
-        /// <returns></returns>
+        /// <returns>A value indicating if content localization is enabled.</returns>
+        /// <example>GET /api/personabar/pages/GetContentLocalizationEnabled.</example>
         [HttpGet]
         public HttpResponseMessage GetContentLocalizationEnabled()
         {
@@ -793,20 +952,24 @@ public HttpResponseMessage GetContentLocalizationEnabled()
                 {
                     return this.GetForbiddenResponse();
                 }
+
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true, this.PortalSettings.ContentLocalizationEnabled });
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred while trying to find if content localization is enabled";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // GET /api/personabar/pages/GetCachedItemCount
         /// <summary>
-        /// Gets GetCachedItemCount. 
+        /// Gets GetCachedItemCount.
         /// </summary>
-        /// <returns></returns>
+        /// <param name="cacheProvider">The cache profider.</param>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>Caching information.</returns>
+        /// <example>GET /api/personabar/pages/GetCachedItemCount.</example>
         [HttpGet]
         public HttpResponseMessage GetCachedItemCount(string cacheProvider, int pageId)
         {
@@ -816,16 +979,24 @@ public HttpResponseMessage GetCachedItemCount(string cacheProvider, int pageId)
                 {
                     return this.GetForbiddenResponse();
                 }
+
                 return this.Request.CreateResponse(HttpStatusCode.OK, new { Success = true, Count = OutputCachingProvider.Instance(cacheProvider).GetItemCount(pageId) });
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var errorMessage = "An unexpected error occurred trying to get the cached items count, please consult the logs for more details.";
+                Logger.Error(errorMessage, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, errorMessage);
             }
         }
 
-        // POST /api/personabar/pages/ClearCache
+        /// <summary>
+        /// Clears the page cache for a given page.
+        /// </summary>
+        /// <param name="cacheProvider">The cache provider to clear the cache for.</param>
+        /// <param name="pageId">The page (tab) id.</param>
+        /// <returns>A status code or an error message.</returns>
+        /// <example>POST /api/personabar/pages/ClearCache .</example>
         [HttpPost]
         [ValidateAntiForgeryToken]
         [AdvancedPermission(MenuName = "Dnn.Pages", Permission = "Edit")]
@@ -833,7 +1004,7 @@ public HttpResponseMessage ClearCache([FromUri] string cacheProvider, [FromUri]
         {
             try
             {
-                if (!this._securityService.CanManagePage(pageId))
+                if (!this.securityService.CanManagePage(pageId))
                 {
                     return this.GetForbiddenResponse();
                 }
@@ -843,14 +1014,12 @@ public HttpResponseMessage ClearCache([FromUri] string cacheProvider, [FromUri]
             }
             catch (Exception ex)
             {
-                Logger.Error(ex);
-                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, ex.ToString());
+                var message = "An unexpected error occurred while trying to clear the cache for this page, see logs for more details.";
+                Logger.Error(message, ex);
+                return this.Request.CreateErrorResponse(HttpStatusCode.InternalServerError, message);
             }
         }
 
-        // From inside Visual Studio editor press [CTRL]+[M] then [O] to collapse source code to definition
-        // From inside Visual Studio editor press [CTRL]+[M] then [P] to expand source code folding
-
         private static string LocalizeString(string key)
         {
             return DotNetNuke.Services.Localization.Localization.GetString(key, LocalResourceFile);
@@ -888,29 +1057,20 @@ private static void DisableTabVersioningAndWorkflow(TabInfo tab)
             }
         }
 
-        //private bool IsDefaultLanguage(string cultureCode)
-        //{
-        //    return string.Equals(cultureCode, PortalSettings.DefaultLanguage, StringComparison.OrdinalIgnoreCase);
-        //}
-
-        //private bool IsLanguageEnabled(string cultureCode)
-        //{
-        //    return _localeController.GetLocales(PortalId).ContainsKey(cultureCode);
-        //}
-
         private DnnPagesDto GetNonLocalizedPages(int tabId)
         {
-            var currentTab = this._tabController.GetTab(tabId, this.PortalId, false);
+            var currentTab = this.tabController.GetTab(tabId, this.PortalId, false);
 
-            //Unique id of default language page
+            // Unique id of default language page
             var uniqueId = currentTab.DefaultLanguageGuid != Null.NullGuid
                 ? currentTab.DefaultLanguageGuid
                 : currentTab.UniqueId;
 
             // get all non admin pages and not deleted
-            var allPages = this._tabController.GetTabsByPortal(this.PortalId).Values.Where(
+            var allPages = this.tabController.GetTabsByPortal(this.PortalId).Values.Where(
                 t => t.TabID != this.PortalSettings.AdminTabId && (Null.IsNull(t.ParentId) || t.ParentId != this.PortalSettings.AdminTabId));
             allPages = allPages.Where(t => t.IsDeleted == false);
+
             // get all localized pages of current page
             var tabInfos = allPages as IList<TabInfo> ?? allPages.ToList();
             var localizedPages = tabInfos.Where(
@@ -925,24 +1085,23 @@ private DnnPagesDto GetNonLocalizedPages(int tabId)
             var localeDict = localeController.GetLocales(this.PortalId);
             if (localeDict.Count == 0)
             {
-                locales.Add(new LocaleInfoDto(""));
+                locales.Add(new LocaleInfoDto(string.Empty));
             }
             else
             {
-                if (localizedPages.Count == 1 && localizedPages.First().CultureCode == "")
+                if (localizedPages.Count == 1 && localizedPages.First().CultureCode == string.Empty)
                 {
                     // locale neutral page
-                    locales.Add(new LocaleInfoDto(""));
+                    locales.Add(new LocaleInfoDto(string.Empty));
                 }
                 else if (localizedPages.Count == 1 && localizedPages.First().CultureCode != this.PortalSettings.DefaultLanguage)
                 {
                     var first = localizedPages.First();
                     locales.Add(new LocaleInfoDto(first.CultureCode));
-                    //localizedTabs = new Dictionary<string, TabInfo> { { first.CultureCode, first } };
                 }
                 else
                 {
-                    //force sort order, so first add default language
+                    // force sort order, so first add default language
                     locales.Add(new LocaleInfoDto(this.PortalSettings.DefaultLanguage));
 
                     // build up a list of localized tabs.
@@ -977,7 +1136,7 @@ where TabPermissionController.CanViewPage(localizedTab.Value)
 
             var dnnPages = new DnnPagesDto(locales)
             {
-                HasMissingLanguages = this._tabController.HasMissingLanguages(this.PortalId, tabId)
+                HasMissingLanguages = this.tabController.HasMissingLanguages(this.PortalId, tabId),
             };
 
             // filter the list of localized pages to only those that have a culture we want to see
@@ -994,34 +1153,36 @@ where TabPermissionController.CanViewPage(localizedTab.Value)
                     dnnPages.Pages.Remove(dnnPage);
                     break;
                 }
+
                 dnnPage.TabId = localTabInfo.TabID;
                 dnnPage.TabName = localTabInfo.TabName;
                 dnnPage.Title = localTabInfo.Title;
                 dnnPage.Description = localTabInfo.Description;
-                dnnPage.Path = localTabInfo.TabPath.Substring(0, localTabInfo.TabPath.LastIndexOf("//", StringComparison.Ordinal)).Replace("//", "");
-                dnnPage.HasChildren = (this._tabController.GetTabsByPortal(this.PortalId).WithParentId(tabInfo.TabID).Count != 0);
+                dnnPage.Path = localTabInfo.TabPath.Substring(0, localTabInfo.TabPath.LastIndexOf("//", StringComparison.Ordinal)).Replace("//", string.Empty);
+                dnnPage.HasChildren = this.tabController.GetTabsByPortal(this.PortalId).WithParentId(tabInfo.TabID).Count != 0;
                 dnnPage.CanAdminPage = TabPermissionController.CanAdminPage(tabInfo);
                 dnnPage.CanViewPage = TabPermissionController.CanViewPage(tabInfo);
                 dnnPage.LocalResourceFile = LocalResourceFile;
-                dnnPage.PageUrl = this.NavigationManager.NavigateURL(localTabInfo.TabID, false, this.PortalSettings, "", localTabInfo.CultureCode);
+                dnnPage.PageUrl = this.NavigationManager.NavigateURL(localTabInfo.TabID, false, this.PortalSettings, string.Empty, localTabInfo.CultureCode);
                 dnnPage.IsSpecial = TabController.IsSpecialTab(localTabInfo.TabID, localTabInfo.PortalID);
 
                 // calculate position in the form of 1.3.2...
-                var siblingTabs = tabInfos.Where(t => t.ParentId == localTabInfo.ParentId && t.CultureCode == localTabInfo.CultureCode || t.CultureCode == null).OrderBy(t => t.TabOrder).ToList();
+                var siblingTabs = tabInfos.Where(t => (t.ParentId == localTabInfo.ParentId && t.CultureCode == localTabInfo.CultureCode) || t.CultureCode == null).OrderBy(t => t.TabOrder).ToList();
                 dnnPage.Position = (siblingTabs.IndexOf(localTabInfo) + 1).ToString(CultureInfo.InvariantCulture);
                 var parentTabId = localTabInfo.ParentId;
                 while (parentTabId > 0)
                 {
                     var parentTab = tabInfos.Single(t => t.TabID == parentTabId);
                     var id = parentTabId;
-                    siblingTabs = tabInfos.Where(t => t.ParentId == id && t.CultureCode == localTabInfo.CultureCode || t.CultureCode == null).OrderBy(t => t.TabOrder).ToList();
+                    siblingTabs = tabInfos.Where(t => (t.ParentId == id && t.CultureCode == localTabInfo.CultureCode) || t.CultureCode == null).OrderBy(t => t.TabOrder).ToList();
                     dnnPage.Position = (siblingTabs.IndexOf(localTabInfo) + 1).ToString(CultureInfo.InvariantCulture) + "." + dnnPage.Position;
                     parentTabId = parentTab.ParentId;
                 }
 
                 dnnPage.DefaultLanguageGuid = localTabInfo.DefaultLanguageGuid;
                 dnnPage.IsTranslated = localTabInfo.IsTranslated;
-                dnnPage.IsPublished = this._tabController.IsTabPublished(localTabInfo);
+                dnnPage.IsPublished = this.tabController.IsTabPublished(localTabInfo);
+
                 // generate modules information
                 var moduleController = ModuleController.Instance;
                 foreach (var moduleInfo in moduleController.GetTabModules(localTabInfo.TabID).Values)
@@ -1030,6 +1191,7 @@ where TabPermissionController.CanViewPage(localizedTab.Value)
 
                     var dnnModules = dnnPages.Module(guid); // modules of each language
                     var dnnModule = dnnModules.Module(localTabInfo.CultureCode);
+
                     // detect error : 2 modules with same uniqueId on the same page
                     dnnModule.LocalResourceFile = LocalResourceFile;
                     if (dnnModule.TabModuleId > 0)
@@ -1054,14 +1216,17 @@ where TabPermissionController.CanViewPage(localizedTab.Value)
                         {
                             dnnModule.DefaultModuleId = defaultLanguageModule.ModuleID;
                             if (defaultLanguageModule.ParentTab.UniqueId != moduleInfo.ParentTab.DefaultLanguageGuid)
+                            {
                                 dnnModule.DefaultTabName = defaultLanguageModule.ParentTab.TabName;
+                            }
                         }
                     }
+
                     dnnModule.SetModuleInfoHelp();
                     dnnModule.IsTranslated = moduleInfo.IsTranslated;
                     dnnModule.IsLocalized = moduleInfo.IsLocalized;
 
-                    dnnModule.IsShared = this._tabController.GetTabsByModuleID(moduleInfo.ModuleID).Values.Count(t => t.CultureCode == moduleInfo.CultureCode) > 1;
+                    dnnModule.IsShared = this.tabController.GetTabsByModuleID(moduleInfo.ModuleID).Values.Count(t => t.CultureCode == moduleInfo.CultureCode) > 1;
 
                     // detect error : the default language module is on an other page
                     dnnModule.ErrorDefaultOnOtherTab = moduleInfo.DefaultLanguageGuid != Null.NullGuid && moduleInfo.DefaultLanguageModule == null;
@@ -1081,7 +1246,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
             // check all pages
             foreach (var page in pages.Pages)
             {
-                var tabInfo = this._tabController.GetTab(page.TabId, this.PortalId, true);
+                var tabInfo = this.tabController.GetTab(page.TabId, this.PortalId, true);
                 if (tabInfo != null &&
                     (tabInfo.TabName != page.TabName ||
                      tabInfo.Title != page.Title ||
@@ -1090,7 +1255,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
                     tabInfo.TabName = page.TabName;
                     tabInfo.Title = page.Title;
                     tabInfo.Description = page.Description;
-                    this._tabController.UpdateTab(tabInfo);
+                    this.tabController.UpdateTab(tabInfo);
                 }
             }
 
@@ -1115,11 +1280,15 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
                         if (tabModule.DefaultLanguageGuid != Null.NullGuid &&
                             tabModule.IsLocalized != moduleDto.IsLocalized)
                         {
-                            var locale = this._localeController.GetLocale(tabModule.CultureCode);
+                            var locale = this.localeController.GetLocale(tabModule.CultureCode);
                             if (moduleDto.IsLocalized)
+                            {
                                 moduleController.LocalizeModule(tabModule, locale);
+                            }
                             else
+                            {
                                 moduleController.DeLocalizeModule(tabModule);
+                            }
                         }
 
                         bool moduleTranslateOverride;
@@ -1167,6 +1336,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
                                             {
                                                 moduleInfo.DefaultLanguageGuid = miDefault.UniqueId;
                                             }
+
                                             moduleController.UpdateModule(moduleInfo);
                                         }
                                     }
@@ -1181,7 +1351,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
 
             foreach (var page in pages.Pages)
             {
-                var tabInfo = this._tabController.GetTab(page.TabId, this.PortalId, true);
+                var tabInfo = this.tabController.GetTab(page.TabId, this.PortalId, true);
                 if (tabInfo != null)
                 {
                     var moduleTranslateOverride = false;
@@ -1189,7 +1359,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
                     {
                         if (tabInfo.IsTranslated != page.IsTranslated)
                         {
-                            this._tabController.UpdateTranslationStatus(tabInfo, page.IsTranslated);
+                            this.tabController.UpdateTranslationStatus(tabInfo, page.IsTranslated);
                             if (page.IsTranslated)
                             {
                                 moduleTranslateOverride = true;
@@ -1219,24 +1389,24 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
             // marks all modules as translated, marks page as translated
             foreach (var tabInfo in tabsToPublish)
             {
-                //First mark all modules as translated
+                // First mark all modules as translated
                 foreach (var module in moduleController.GetTabModules(tabInfo.TabID).Values)
                 {
                     moduleController.UpdateTranslationStatus(module, true);
                 }
 
-                //Second mark tab as translated
-                this._tabController.UpdateTranslationStatus(tabInfo, true);
+                // Second mark tab as translated
+                this.tabController.UpdateTranslationStatus(tabInfo, true);
 
-                //Third publish Tab (update Permissions)
-                this._tabController.PublishTab(tabInfo);
+                // Third publish Tab (update Permissions)
+                this.tabController.PublishTab(tabInfo);
             }
 
             // manage translated status of tab. In order to do that, we need to check if all modules on the page are translated
             var tabTranslatedStatus = true;
             foreach (var page in pages.Pages)
             {
-                var tabInfo = this._tabController.GetTab(page.TabId, this.PortalId, true);
+                var tabInfo = this.tabController.GetTab(page.TabId, this.PortalId, true);
                 if (tabInfo != null)
                 {
                     if (tabInfo.ChildModules.Any(moduleKvp => !moduleKvp.Value.IsTranslated))
@@ -1246,7 +1416,7 @@ private void SaveNonLocalizedPages(DnnPagesRequest pages)
 
                     if (tabTranslatedStatus && !tabInfo.IsTranslated)
                     {
-                        this._tabController.UpdateTranslationStatus(tabInfo, true);
+                        this.tabController.UpdateTranslationStatus(tabInfo, true);
                     }
                 }
             }
@@ -1257,7 +1427,8 @@ private void AddTranslationSubmittedNotification(TabInfo tabInfo, UserInfo trans
             var notificationsController = NotificationsController.Instance;
             var notificationType = notificationsController.GetNotificationType("TranslationSubmitted");
             var subject = LocalizeString("NewContentMessage.Subject");
-            var body = string.Format(LocalizeString("NewContentMessage.Body"),
+            var body = string.Format(
+                LocalizeString("NewContentMessage.Body"),
                 tabInfo.TabName,
                 this.NavigationManager.NavigateURL(tabInfo.TabID, false, this.PortalSettings, Null.NullString, tabInfo.CultureCode),
                 comment);
@@ -1269,7 +1440,7 @@ private void AddTranslationSubmittedNotification(TabInfo tabInfo, UserInfo trans
                 Subject = subject,
                 Body = body,
                 IncludeDismissAction = true,
-                SenderUserID = sender.UserID
+                SenderUserID = sender.UserID,
             };
 
             notificationsController.SendNotification(notification, this.PortalSettings.PortalId, null, new List<UserInfo> { translator });
@@ -1282,28 +1453,30 @@ private HttpResponseMessage GetForbiddenResponse()
 
         private ThemeFileInfo GetDefaultPortalTheme()
         {
-            var layoutSrc = this._defaultPortalThemeController.GetDefaultPortalLayout();
+            var layoutSrc = this.defaultPortalThemeController.GetDefaultPortalLayout();
             if (string.IsNullOrWhiteSpace(layoutSrc))
             {
                 return null;
             }
-            var layout = this._themesController.GetThemeFile(PortalSettings.Current, layoutSrc, ThemeType.Skin);
+
+            var layout = this.themesController.GetThemeFile(PortalSettings.Current, layoutSrc, ThemeType.Skin);
             return layout;
         }
 
         private TabInfo GetLocalizedTab(int tabId, string cultureCode)
         {
-            var currentTab = this._tabController.GetTab(tabId, this.PortalId, false);
+            var currentTab = this.tabController.GetTab(tabId, this.PortalId, false);
 
-            //Unique id of default language page
+            // Unique id of default language page
             var uniqueId = currentTab.DefaultLanguageGuid != Null.NullGuid
                 ? currentTab.DefaultLanguageGuid
                 : currentTab.UniqueId;
 
             // get all non admin pages and not deleted
-            var allPages = this._tabController.GetTabsByPortal(this.PortalId).Values.Where(
+            var allPages = this.tabController.GetTabsByPortal(this.PortalId).Values.Where(
                 t => t.TabID != this.PortalSettings.AdminTabId && (Null.IsNull(t.ParentId) || t.ParentId != this.PortalSettings.AdminTabId));
             allPages = allPages.Where(t => t.IsDeleted == false);
+
             // get all localized pages of current page
             var tabInfos = allPages as IList<TabInfo> ?? allPages.ToList();
             return tabInfos.SingleOrDefault(t => (t.DefaultLanguageGuid == uniqueId || t.UniqueId == uniqueId) && t.CultureCode == cultureCode);
diff --git a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
index 0a97911d7de..44ba83ed003 100644
--- a/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
+++ b/Dnn.AdminExperience/EditBar/Dnn.EditBar.UI/Dnn.EditBar.UI.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.EditBar.UI" type="Library" version="09.06.02">
+        <package name="Dnn.EditBar.UI" type="Library" version="09.07.00">
             <friendlyName>Dnn.EditBar.UI</friendlyName>
             <description></description>
             <dependencies/>
diff --git a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
index 2c32b3df3f0..64e3f879532 100644
--- a/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
+++ b/Dnn.AdminExperience/Library/Dnn.PersonaBar.UI/Dnn.PersonaBar.UI.dnn
@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
     <packages>
-        <package name="Dnn.PersonaBar.UI" type="Library" version="09.06.02">
+        <package name="Dnn.PersonaBar.UI" type="Library" version="09.07.00">
             <friendlyName>Dnn.PersonaBar.UI</friendlyName>
             <description></description>
             <dependencies/>
diff --git a/SolutionInfo.cs b/SolutionInfo.cs
index a1e1b10efe8..779cb1df27a 100644
--- a/SolutionInfo.cs
+++ b/SolutionInfo.cs
@@ -12,6 +12,6 @@
 [assembly: AssemblyProduct("https://dnncommunity.org")]
 [assembly: AssemblyCopyright("DNN Platform is copyright 2002-2020 by .NET Foundation. All Rights Reserved.")]
 [assembly: AssemblyTrademark("DNN")]
-[assembly: AssemblyVersion("9.6.2.0")]
-[assembly: AssemblyFileVersion("9.6.2.0")]
-[assembly: AssemblyInformationalVersion("9.6.2.0 Custom build")]
+[assembly: AssemblyVersion("9.7.0.0")]
+[assembly: AssemblyFileVersion("9.7.0.0")]
+[assembly: AssemblyInformationalVersion("9.7.0.0 Custom build")]
diff --git a/package.json b/package.json
index 9297c5ec642..8d02c2e6a5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dnn-platform",
-  "version": "9.6.2",
+  "version": "9.7.0",
   "private": true,
   "workspaces": [
     "Dnn.AdminExperience/ClientSide/AdminLogs.Web",