From 0a49d54a8510ad54afa798f30e38ba783c530c41 Mon Sep 17 00:00:00 2001
From: Tom Pipe <tompipe2008@gmail.com>
Date: Sat, 29 Oct 2016 18:23:25 +0100
Subject: [PATCH 01/52] Fixed issue with member properties sort order

---
 src/Umbraco.Web/Security/MembershipHelper.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Security/MembershipHelper.cs b/src/Umbraco.Web/Security/MembershipHelper.cs
index 4f5c14723b..158910a794 100644
--- a/src/Umbraco.Web/Security/MembershipHelper.cs
+++ b/src/Umbraco.Web/Security/MembershipHelper.cs
@@ -428,7 +428,8 @@ namespace Umbraco.Web.Security
             var viewProperties = new List<UmbracoProperty>();
 
             foreach (var prop in memberType.PropertyTypes
-                    .Where(x => builtIns.Contains(x.Alias) == false && memberType.MemberCanEditProperty(x.Alias)))
+                    .Where(x => builtIns.Contains(x.Alias) == false && memberType.MemberCanEditProperty(x.Alias))
+                    .OrderBy(p => p.SortOrder))
             {
                 var value = string.Empty;
                 if (member != null)

From e9724c8785b40197e59b78d064f4aef89698c7cf Mon Sep 17 00:00:00 2001
From: mikkelhm <mikkel@umbraco.com>
Date: Sun, 30 Oct 2016 20:46:18 +0100
Subject: [PATCH 02/52] Updates web.config.install.xdt to re-add the
 assemblyBinding for HtmlAgilityPack after removing it earlier

---
 build/NuSpecs/tools/Web.config.install.xdt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/tools/Web.config.install.xdt b/build/NuSpecs/tools/Web.config.install.xdt
index 2d5dfb0bdb..cbb60bb949 100644
--- a/build/NuSpecs/tools/Web.config.install.xdt
+++ b/build/NuSpecs/tools/Web.config.install.xdt
@@ -335,7 +335,7 @@
 
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
+      <dependentAssembly xdt:Transform="Insert">
         <assemblyIdentity name="HtmlAgilityPack" publicKeyToken="bd319b19eaf3b43a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-1.4.9.0" newVersion="1.4.9.0" />
       </dependentAssembly>

From dfbadb155077c26aab0031a4f62112c2a28dc5f2 Mon Sep 17 00:00:00 2001
From: Steve Morgan <steve@siempresolutions.co.uk>
Date: Thu, 3 Nov 2016 17:03:33 +0000
Subject: [PATCH 03/52] U4-9148 noNodes Splash screen apostrophe char typo
 fixed (in "Be a part of the community" - we're)

---
 src/Umbraco.Web.UI/config/splashes/noNodes.aspx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
index 92bf10650c..d46ecd6113 100644
--- a/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
+++ b/src/Umbraco.Web.UI/config/splashes/noNodes.aspx
@@ -44,7 +44,7 @@
 
 				<div class="col">
 					<h2>Be a part of the community</h2>
-					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we’re sure that you can get your answers from the community.</p>
+					<p>The Umbraco community is the best of its kind, be sure to visit, and if you have any questions, we're sure that you can get your answers from the community.</p>
 					
 					<a href="http://our.umbraco.org?ref=ourFromInstaller" target="_blank">our.Umbraco &rarr;</a>
 				</div>

From a70f37a53eeeb57364d31bc8468906576f498c1f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 17 Nov 2016 16:46:06 +0100
Subject: [PATCH 04/52] U4-9185 lastLockoutDate does not get set when too many
 invalid password attempts are made

---
 src/Umbraco.Core/Security/BackOfficeUserStore.cs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/Umbraco.Core/Security/BackOfficeUserStore.cs b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
index c6714e256a..08c6f54dcf 100644
--- a/src/Umbraco.Core/Security/BackOfficeUserStore.cs
+++ b/src/Umbraco.Core/Security/BackOfficeUserStore.cs
@@ -644,6 +644,13 @@ namespace Umbraco.Core.Security
             {
                 anythingChanged = true;
                 user.IsLockedOut = identityUser.IsLockedOut;
+
+                if (user.IsLockedOut)
+                {
+                    //need to set the last lockout date
+                    user.LastLockoutDate = DateTime.Now;
+                }
+
             }
             if (user.Username != identityUser.UserName && identityUser.UserName.IsNullOrWhiteSpace() == false)
             {

From d0862448202128c8f6ca7b5a5100727d720502f0 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 18 Nov 2016 09:28:58 +0100
Subject: [PATCH 05/52] U4-9201 - expose PetaPoco Database type + dispose

---
 src/Umbraco.Core/Persistence/PetaPoco.cs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs
index 63278889a2..c016276116 100644
--- a/src/Umbraco.Core/Persistence/PetaPoco.cs
+++ b/src/Umbraco.Core/Persistence/PetaPoco.cs
@@ -181,7 +181,7 @@ namespace Umbraco.Core.Persistence
 			CommonConstruct();
 		}
 
-		internal enum DBType
+		public enum DBType
 		{
 			SqlServer,
 			SqlServerCE,
@@ -190,7 +190,9 @@ namespace Umbraco.Core.Persistence
 			Oracle,
             SQLite
 		}
-		DBType _dbType = DBType.SqlServer;
+		private DBType _dbType = DBType.SqlServer;
+
+        public DBType DatabaseType { get { return _dbType; } }
 
 		// Common initialization
 		private void CommonConstruct()
@@ -224,13 +226,18 @@ namespace Umbraco.Core.Persistence
 		// Automatically close one open shared connection
 		public void Dispose()
 		{
-			// Automatically close one open connection reference
-			//  (Works with KeepConnectionAlive and manually opening a shared connection)
-			CloseSharedConnection();
+		    Dispose(true);
 		}
 
-		// Set to true to keep the first opened connection alive until this object is disposed
-		public bool KeepConnectionAlive { get; set; }
+	    protected virtual void Dispose(bool disposing)
+	    {
+            // Automatically close one open connection reference
+            //  (Works with KeepConnectionAlive and manually opening a shared connection)
+            CloseSharedConnection();
+        }
+
+        // Set to true to keep the first opened connection alive until this object is disposed
+        public bool KeepConnectionAlive { get; set; }
 
 		// Open a connection (can be nested)
 		public void OpenSharedConnection()

From 13ed3757da4b15d76d3a2316b8a08e0997cc8949 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 18 Nov 2016 09:42:07 +0100
Subject: [PATCH 06/52] U4-9201 - properly manage database instances

---
 src/Umbraco.Core/DatabaseContext.cs           | 140 +++++++----
 .../Persistence/DefaultDatabaseFactory.cs     | 218 +++++++++++++-----
 .../Persistence/UmbracoDatabase.cs            |  69 +++++-
 src/Umbraco.Core/UmbracoApplicationBase.cs    |  13 +-
 4 files changed, 337 insertions(+), 103 deletions(-)

diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 585f1d51cf..f8f31ee695 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -1,10 +1,10 @@
 using System;
+using System.Collections.Generic;
 using System.Configuration;
 using System.Data.SqlServerCe;
 using System.IO;
 using System.Linq;
 using System.Web;
-using System.Web.Configuration;
 using System.Xml.Linq;
 using Semver;
 using Umbraco.Core.Configuration;
@@ -30,7 +30,6 @@ namespace Umbraco.Core
         private readonly ILogger _logger;
         private readonly SqlSyntaxProviders _syntaxProviders;
         private bool _configured;
-        private readonly object _locker = new object();
         private string _connectionString;
         private string _providerName;
         private DatabaseSchemaResult _result;
@@ -40,7 +39,7 @@ namespace Umbraco.Core
             : this(factory, LoggerResolver.Current.Logger, new SqlSyntaxProviders(new ISqlSyntaxProvider[]
             {
                 new MySqlSyntaxProvider(LoggerResolver.Current.Logger),
-                new SqlCeSyntaxProvider(), 
+                new SqlCeSyntaxProvider(),
                 new SqlServerSyntaxProvider()
             }))
         {
@@ -80,21 +79,55 @@ namespace Umbraco.Core
             _configured = true;
         }
 
+#if DEBUG_DATABASES
+        public List<UmbracoDatabase> Databases
+        {
+            get
+            {
+                var factory = _factory as DefaultDatabaseFactory;
+                if (factory == null) throw new NotSupportedException();
+                return factory.Databases;
+            }
+        }
+#endif
+
         public ISqlSyntaxProvider SqlSyntax { get; private set; }
 
         /// <summary>
-        /// Gets the <see cref="Database"/> object for doing CRUD operations
-        /// against custom tables that resides in the Umbraco database.
+        /// Gets the <see cref="Database"/> object for doing CRUD operations against custom tables that resides in the Umbraco database.
         /// </summary>
         /// <remarks>
-        /// This should not be used for CRUD operations or queries against the
-        /// standard Umbraco tables! Use the Public services for that.
+        /// <para>Should not be used for operation against standard Umbraco tables; as services should be used instead.</para>
+        /// <para>Gets or creates an "ambient" database that is either stored in http context + available for the whole
+        /// request + auto-disposed at the end of the request, or in call context if there is no http context - in which
+        /// case it needs to be explicitely disposed so it is removed from call context.</para>
         /// </remarks>
         public virtual UmbracoDatabase Database
         {
             get { return _factory.CreateDatabase(); }
         }
 
+        /// <summary>
+        /// Replaces the "ambient" database (if any) and installs a new <see cref="Database"/> object.
+        /// </summary>
+        /// <remarks>
+        /// <para>The returned IDisposable *must* be diposed in order to properly disposed the safe database and
+        /// restore the original "ambient" database (if any).</para>
+        /// <para>This is to be used in background tasks to ensure that they have an "ambient" database which
+        /// will be properly removed from call context and does not interfere with anything else. In most case
+        /// it is not replacing anything, just temporarily installing a database in context.</para>
+        /// </remarks>
+        public virtual IDisposable UsingSafeDatabase
+        {
+            get
+            {
+                var factory = _factory as DefaultDatabaseFactory;
+                if (factory == null) throw new NotSupportedException();
+                var database = factory.CreateDatabaseInstance(DefaultDatabaseFactory.ContextOwner.None);
+                return new UsedDatabase(database, _logger);
+            }
+        }
+
         /// <summary>
         /// Boolean indicating whether the database has been configured
         /// </summary>
@@ -189,7 +222,7 @@ namespace Umbraco.Core
                 // since it's been like this for quite some time
                 //using (var engine = new SqlCeEngine(connectionString))
                 //{
-                //    engine.CreateDatabase();    
+                //    engine.CreateDatabase();
                 //}
             }
 
@@ -230,14 +263,14 @@ namespace Umbraco.Core
         /// <param name="password">Database Password</param>
         /// <param name="databaseProvider">Type of the provider to be used (Sql, Sql Azure, Sql Ce, MySql)</param>
         public void ConfigureDatabaseConnection(string server, string databaseName, string user, string password, string databaseProvider)
-        {            
+        {
             string providerName;
             var connectionString = GetDatabaseConnectionString(server, databaseName, user, password, databaseProvider, out providerName);
 
             SaveConnectionString(connectionString, providerName);
             Initialize(providerName);
         }
-        
+
         public string GetDatabaseConnectionString(string server, string databaseName, string user, string password, string databaseProvider, out string providerName)
         {
             providerName = Constants.DatabaseProviders.SqlServer;
@@ -268,18 +301,18 @@ namespace Umbraco.Core
 
         public string GetIntegratedSecurityDatabaseConnectionString(string server, string databaseName)
         {
-            return String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);            
+            return String.Format("Server={0};Database={1};Integrated Security=true", server, databaseName);
         }
 
         internal string BuildAzureConnectionString(string server, string databaseName, string user, string password)
         {
             if (server.Contains(".") && ServerStartsWithTcp(server) == false)
                 server = string.Format("tcp:{0}", server);
-            
+
             if (server.Contains(".") == false && ServerStartsWithTcp(server))
             {
-                string serverName = server.Contains(",") 
-                                        ? server.Substring(0, server.IndexOf(",", StringComparison.Ordinal)) 
+                string serverName = server.Contains(",")
+                                        ? server.Substring(0, server.IndexOf(",", StringComparison.Ordinal))
                                         : server;
 
                 var portAddition = string.Empty;
@@ -289,10 +322,10 @@ namespace Umbraco.Core
 
                 server = string.Format("{0}.database.windows.net{1}", serverName, portAddition);
             }
-            
+
             if (ServerStartsWithTcp(server) == false)
                 server = string.Format("tcp:{0}.database.windows.net", server);
-            
+
             if (server.Contains(",") == false)
                 server = string.Format("{0},1433", server);
 
@@ -336,7 +369,7 @@ namespace Umbraco.Core
 
             _connectionString = connectionString;
             _providerName = providerName;
-            
+
             var fileName = IOHelper.MapPath(string.Format("{0}/web.config", SystemDirectories.Root));
             var xml = XDocument.Load(fileName, LoadOptions.PreserveWhitespace);
             var connectionstrings = xml.Root.DescendantsAndSelf("connectionStrings").Single();
@@ -381,7 +414,7 @@ namespace Umbraco.Core
                     connString = ConfigurationManager.ConnectionStrings[GlobalSettings.UmbracoConnectionName].ConnectionString;
                 }
                 Initialize(providerName, connString);
-                
+
             }
             else if (ConfigurationManager.AppSettings.ContainsKey(GlobalSettings.UmbracoConnectionName) && string.IsNullOrEmpty(ConfigurationManager.AppSettings[GlobalSettings.UmbracoConnectionName]) == false)
             {
@@ -418,7 +451,7 @@ namespace Umbraco.Core
 
                 //Remove the legacy connection string, so we don't end up in a loop if something goes wrong.
                 GlobalSettings.RemoveSetting(GlobalSettings.UmbracoConnectionName);
-                
+
             }
             else
             {
@@ -437,15 +470,15 @@ namespace Umbraco.Core
             {
                 if (_syntaxProviders != null)
                 {
-                    SqlSyntax = _syntaxProviders.GetByProviderNameOrDefault(providerName);    
+                    SqlSyntax = _syntaxProviders.GetByProviderNameOrDefault(providerName);
                 }
                 else if (SqlSyntax == null)
                 {
                     throw new InvalidOperationException("No " + typeof(ISqlSyntaxProvider) + " specified or no " + typeof(SqlSyntaxProviders) + " instance specified");
                 }
-                
+
                 SqlSyntaxContext.SqlSyntaxProvider = SqlSyntax;
-                
+
                 _configured = true;
             }
             catch (Exception e)
@@ -485,7 +518,7 @@ namespace Umbraco.Core
         }
 
         internal Result CreateDatabaseSchemaAndData(ApplicationContext applicationContext)
-        {   
+        {
             try
             {
                 var readyForInstall = CheckReadyForInstall();
@@ -503,7 +536,7 @@ namespace Umbraco.Core
                 // If MySQL, we're going to ensure that database calls are maintaining proper casing as to remove the necessity for checks
                 // for case insensitive queries. In an ideal situation (which is what we're striving for), all calls would be case sensitive.
 
-                /*                
+                /*
                 var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);
                 if (supportsCaseInsensitiveQueries  == false)
                 {
@@ -521,9 +554,9 @@ namespace Umbraco.Core
                 message = GetResultMessageForMySql();
 
                 var schemaResult = ValidateDatabaseSchema();
-                
+
                 var installedSchemaVersion = schemaResult.DetermineInstalledVersion();
-                
+
                 //If Configuration Status is empty and the determined version is "empty" its a new install - otherwise upgrade the existing
                 if (string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus) && installedSchemaVersion.Equals(new Version(0, 0, 0)))
                 {
@@ -542,9 +575,9 @@ namespace Umbraco.Core
                 message = "<p>Upgrading database, this may take some time...</p>";
                 return new Result
                     {
-                        RequiresUpgrade = true, 
-                        Message = message, 
-                        Success = true, 
+                        RequiresUpgrade = true,
+                        Message = message,
+                        Success = true,
                         Percentage = "30"
                     };
             }
@@ -572,7 +605,7 @@ namespace Umbraco.Core
                 _logger.Info<DatabaseContext>("Database upgrade started");
 
                 var database = new UmbracoDatabase(_connectionString, ProviderName, _logger);
-                //var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);                
+                //var supportsCaseInsensitiveQueries = SqlSyntax.SupportsCaseInsensitiveQueries(database);
 
                 var message = GetResultMessageForMySql();
 
@@ -580,32 +613,32 @@ namespace Umbraco.Core
 
                 var installedSchemaVersion = new SemVersion(schemaResult.DetermineInstalledVersion());
 
-                var installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);    
-                
+                var installedMigrationVersion = schemaResult.DetermineInstalledVersionByMigrations(migrationEntryService);
+
                 var targetVersion = UmbracoVersion.Current;
-                
+
                 //In some cases - like upgrading from 7.2.6 -> 7.3, there will be no migration information in the database and therefore it will
-                // return a version of 0.0.0 and we don't necessarily want to run all migrations from 0 -> 7.3, so we'll just ensure that the 
+                // return a version of 0.0.0 and we don't necessarily want to run all migrations from 0 -> 7.3, so we'll just ensure that the
                 // migrations are run for the target version
                 if (installedMigrationVersion == new SemVersion(new Version(0, 0, 0)) && installedSchemaVersion > new SemVersion(new Version(0, 0, 0)))
                 {
                     //set the installedMigrationVersion to be one less than the target so the latest migrations are guaranteed to execute
                     installedMigrationVersion = new SemVersion(targetVersion.SubtractRevision());
                 }
-                
+
                 //Figure out what our current installed version is. If the web.config doesn't have a version listed, then we'll use the minimum
-                // version detected between the schema installed and the migrations listed in the migration table. 
+                // version detected between the schema installed and the migrations listed in the migration table.
                 // If there is a version in the web.config, we'll take the minimum between the listed migration in the db and what
                 // is declared in the web.config.
-                
+
                 var currentInstalledVersion = string.IsNullOrEmpty(GlobalSettings.ConfigurationStatus)
                     //Take the minimum version between the detected schema version and the installed migration version
                     ? new[] {installedSchemaVersion, installedMigrationVersion}.Min()
                     //Take the minimum version between the installed migration version and the version specified in the config
                     : new[] { SemVersion.Parse(GlobalSettings.ConfigurationStatus), installedMigrationVersion }.Min();
 
-                //Ok, another edge case here. If the current version is a pre-release, 
-                // then we want to ensure all migrations for the current release are executed. 
+                //Ok, another edge case here. If the current version is a pre-release,
+                // then we want to ensure all migrations for the current release are executed.
                 if (currentInstalledVersion.Prerelease.IsNullOrWhiteSpace() == false)
                 {
                     currentInstalledVersion  = new SemVersion(currentInstalledVersion.GetVersion().SubtractRevision());
@@ -740,7 +773,7 @@ namespace Umbraco.Core
                 {
                     var datasource = dataSourcePart.Replace("|DataDirectory|", AppDomain.CurrentDomain.GetData("DataDirectory").ToString());
                     var filePath = datasource.Replace("Data Source=", string.Empty);
-                    sqlCeDatabaseExists = File.Exists(filePath);                    
+                    sqlCeDatabaseExists = File.Exists(filePath);
                 }
             }
 
@@ -754,5 +787,32 @@ namespace Umbraco.Core
 
             return true;
         }
+
+        private class UsedDatabase : IDisposable
+        {
+            private readonly UmbracoDatabase _database;
+            private readonly ILogger _logger;
+
+            public UsedDatabase(UmbracoDatabase database, ILogger logger)
+            {
+                _logger = logger;
+
+                // replace with ours
+                _database = DefaultDatabaseFactory.DetachDatabase();
+                _logger.Debug<DatabaseContext>("Detached db " + (_database == null ? "x" : _database.InstanceSid) + ".");
+                DefaultDatabaseFactory.AttachDatabase(database);
+                _logger.Debug<DatabaseContext>("Attached db " + database.InstanceSid + ".");
+            }
+
+            public void Dispose()
+            {
+                // restore the original DB
+                var db = DefaultDatabaseFactory.DetachDatabase();
+                _logger.Debug<DatabaseContext>("Detached db " + db.InstanceSid + ".");
+                db.Dispose();
+                DefaultDatabaseFactory.AttachDatabase(_database);
+                _logger.Debug<DatabaseContext>("Attached db " + (_database == null ? "x" : _database.InstanceSid) + ".");
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index 4ad425d9c9..5139da20d8 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -75,69 +75,168 @@ namespace Umbraco.Core.Persistence
 
 		public UmbracoDatabase CreateDatabase()
 		{
-            // no http context, create the call context object
-            // NOTHING is going to track the object and it is the responsibility of the caller to release it!
-            // using the ReleaseDatabase method.
+            UmbracoDatabase database;
+
+            // gets or creates a database, using either the call context (if no http context) or
+            // the current request context (http context) to store it. once done using the database,
+            // it should be disposed - which will remove it from whatever context it is currently
+            // stored in. this is automatic with http context because UmbracoDatabase implements
+            // IDisposeOnRequestEnd, but NOT with call context.
+
             if (HttpContext.Current == null)
             {
-                LogHelper.Debug<DefaultDatabaseFactory>("Get NON http [T" + Environment.CurrentManagedThreadId + "]");
-                var value = NonContextValue;
-                if (value != null) return value;
-                lock (Locker)
+                database = NonContextValue;
+                if (database == null)
                 {
-                    value = NonContextValue;
-                    if (value != null) return value;
-
-                    LogHelper.Debug<DefaultDatabaseFactory>("Create NON http [T" + Environment.CurrentManagedThreadId + "]");
-                    NonContextValue = value = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
-                                            ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
-                                            : new UmbracoDatabase(_connectionStringName, _logger);
-
-                    return value;
+                    lock (Locker)
+                    {
+                        database = NonContextValue;
+                        if (database == null)
+                        {
+                            database = CreateDatabaseInstance(ContextOwner.CallContext);
+                            NonContextValue = database;
+                        }
+#if DEBUG_DATABASES
+                        else
+                        {
+                            Log("Get lcc", database);
+                        }
+#endif
+                    }
                 }
+#if DEBUG_DATABASES
+                else
+                {
+                    Log("Get lcc", database);
+                }
+#endif
+                return database;
             }
 
-            // we have an http context, so only create one per request.
-            // UmbracoDatabase is marked IDisposeOnRequestEnd and therefore will be disposed when
-            // UmbracoModule attempts to dispose the relevant HttpContext items. so we DO dispose
-            // connections at the end of each request. no need to call ReleaseDatabase.
-            LogHelper.Debug<DefaultDatabaseFactory>("Get http [T" + Environment.CurrentManagedThreadId + "]");
-            if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
-            {
-                LogHelper.Debug<DefaultDatabaseFactory>("Create http [T" + Environment.CurrentManagedThreadId + "]");
-                HttpContext.Current.Items.Add(typeof(DefaultDatabaseFactory),
-                                              string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
-                                                  ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
-                                                  : new UmbracoDatabase(_connectionStringName, _logger));
+		    if (HttpContext.Current.Items.Contains(typeof (DefaultDatabaseFactory)) == false)
+		    {
+		        database = CreateDatabaseInstance(ContextOwner.HttpContext);
+                HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory), database);
+		    }
+		    else
+		    {
+		        database = (UmbracoDatabase) HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+#if DEBUG_DATABASES
+                Log("Get ctx", database);
+#endif
             }
-            return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+
+            return database;
+		}
+
+        // called by UmbracoDatabase when disposed, so that the factory can de-list it from context
+	    internal void OnDispose(UmbracoDatabase disposing)
+	    {
+	        var value = disposing;
+	        switch (disposing.ContextOwner)
+	        {
+                case ContextOwner.CallContext:
+                    value = NonContextValue;
+                    break;
+                case ContextOwner.HttpContext:
+                    value = (UmbracoDatabase) HttpContext.Current.Items[typeof (DefaultDatabaseFactory)];
+                    break;
+	        }
+
+            if (value != null && value.InstanceId != disposing.InstanceId) throw new Exception("panic: wrong db.");
+
+            switch (disposing.ContextOwner)
+            {
+                case ContextOwner.CallContext:
+                    NonContextValue = null;
+                    break;
+                case ContextOwner.HttpContext:
+                    HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
+                    break;
+            }
+
+            disposing.ContextOwner = ContextOwner.None;
+
+#if DEBUG_DATABASES
+            _databases.Remove(value);
+#endif
         }
 
-        // releases the "context" database
-        public void ReleaseDatabase()
+#if DEBUG_DATABASES
+        // helps identifying when non-httpContext databases are created by logging the stack trace
+        private void LogCallContextStack()
         {
-            if (HttpContext.Current == null)
-            {
-                var value = NonContextValue;
-                if (value != null) value.Dispose();
-                NonContextValue = null;
-            }
+            var trace = Environment.StackTrace;
+            if (trace.IndexOf("ScheduledPublishing") > 0)
+                LogHelper.Debug<DefaultDatabaseFactory>("CallContext: Scheduled Publishing");
+            else if (trace.IndexOf("TouchServerTask") > 0)
+                LogHelper.Debug<DefaultDatabaseFactory>("CallContext: Server Registration");
+            else if (trace.IndexOf("LogScrubber") > 0)
+                LogHelper.Debug<DefaultDatabaseFactory>("CallContext: Log Scrubber");
             else
-            {
-                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-                if (db != null) db.Dispose();
-                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
-            }
+                LogHelper.Debug<DefaultDatabaseFactory>("CallContext: " + Environment.StackTrace);
         }
 
+        private readonly List<UmbracoDatabase> _databases = new List<UmbracoDatabase>();
+
+        // helps identifying database leaks by keeping track of all instances
+        public List<UmbracoDatabase> Databases { get { return _databases; } }
+
+        private static void Log(string message, UmbracoDatabase database)
+        {
+            LogHelper.Debug<DefaultDatabaseFactory>(message + " (" + (database == null ? "" : database.InstanceSid) + ").");
+        }
+#endif
+
+        internal enum ContextOwner
+        {
+            None,
+            HttpContext,
+            CallContext
+        }
+
+        internal UmbracoDatabase CreateDatabaseInstance(ContextOwner contextOwner)
+	    {
+            var database = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+                    ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
+                    : new UmbracoDatabase(_connectionStringName, _logger);
+	        database.ContextOwner = contextOwner;
+	        database.DatabaseFactory = this;
+            //database.EnableSqlTrace = true;
+#if DEBUG_DATABASES
+            Log("Create " + contextOwner, database);
+            if (contextOwner == ContextOwner.CallContext)
+                LogCallContextStack();
+            _databases.Add(database);
+#endif
+            return database;
+	    }
+
         protected override void DisposeResources()
 		{
-            ReleaseDatabase();
-		}
+            UmbracoDatabase database;
+
+            if (HttpContext.Current == null)
+            {
+                database = NonContextValue;
+#if DEBUG_DATABASES
+                Log("Release lcc", database);
+#endif
+            }
+            else
+            {
+                database = (UmbracoDatabase) HttpContext.Current.Items[typeof (DefaultDatabaseFactory)];
+#if DEBUG_DATABASES
+                Log("Release ctx", database);
+#endif
+            }
+
+            if (database != null) database.Dispose(); // removes it from call context
+        }
 
         // during tests, the thread static var can leak between tests
         // this method provides a way to force-reset the variable
-	    internal void ResetForTests()
+        internal void ResetForTests()
 	    {
             var value = NonContextValue;
             if (value != null) value.Dispose();
@@ -156,26 +255,29 @@ namespace Umbraco.Core.Persistence
 
         // detaches the current database
         // ie returns the database and remove it from whatever is "context"
-        private static UmbracoDatabase DetachDatabase()
+        internal static UmbracoDatabase DetachDatabase()
         {
+            UmbracoDatabase database;
+
             if (HttpContext.Current == null)
             {
-                var db = NonContextValue;
+                database = NonContextValue;
                 NonContextValue = null;
-                return db;
             }
             else
             {
-                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
-                return db;
+                database = (UmbracoDatabase) HttpContext.Current.Items[typeof (DefaultDatabaseFactory)];
+                HttpContext.Current.Items.Remove(typeof (DefaultDatabaseFactory));
             }
+
+            if (database != null) database.ContextOwner = ContextOwner.None;
+            return database;
         }
 
         // attach a current database
         // ie assign it to whatever is "context"
         // throws if there already is a database
-        private static void AttachDatabase(object o)
+        internal static void AttachDatabase(object o)
         {
             var database = o as UmbracoDatabase;
             if (o != null && database == null) throw new ArgumentException("Not an UmbracoDatabase.", "o");
@@ -183,12 +285,18 @@ namespace Umbraco.Core.Persistence
             if (HttpContext.Current == null)
             {
                 if (NonContextValue != null) throw new InvalidOperationException();
-                if (database != null) NonContextValue = database;
+                if (database == null) return;
+
+                NonContextValue = database;
+                database.ContextOwner = ContextOwner.CallContext;
             }
             else
             {
-                if (HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
-                if (database != null) HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] = database;
+                if (HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
+                if (database == null) return;
+
+                HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] = database;
+                database.ContextOwner = ContextOwner.HttpContext;
             }
         }
 
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index 7ff9cabe84..62cbfa78c4 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Data.SqlClient;
 using System.Text;
+using MySql.Data.MySqlClient;
 using StackExchange.Profiling;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.SqlSyntax;
@@ -21,6 +23,12 @@ namespace Umbraco.Core.Persistence
         private readonly ILogger _logger;
         private readonly Guid _instanceId = Guid.NewGuid();
         private bool _enableCount;
+#if DEBUG_DATABASES
+        private int _spid = -1;
+#endif
+
+        internal DefaultDatabaseFactory.ContextOwner ContextOwner = DefaultDatabaseFactory.ContextOwner.None;
+        internal DefaultDatabaseFactory DatabaseFactory = null;
 
         /// <summary>
         /// Used for testing
@@ -30,6 +38,18 @@ namespace Umbraco.Core.Persistence
             get { return _instanceId; }
         }
 
+        public string InstanceSid
+        {
+            get
+            {
+#if DEBUG_DATABASES
+                return _instanceId.ToString("N").Substring(0, 8) + ":" + _spid;
+#else
+                return _instanceId.ToString("N").Substring(0, 8);
+#endif
+            }
+        }
+
         /// <summary>
         /// Generally used for testing, will output all SQL statements executed to the logger
         /// </summary>
@@ -113,13 +133,44 @@ namespace Umbraco.Core.Persistence
         {
             // propagate timeout if none yet
 
+#if DEBUG_DATABASES
+            if (DatabaseType == DBType.MySql)
+            {
+                using (var command = connection.CreateCommand())
+                {
+                    command.CommandText = "SELECT CONNECTION_ID()";
+                    _spid = Convert.ToInt32(command.ExecuteScalar());
+                }
+            }
+            else if (DatabaseType == DBType.SqlServer)
+            {
+                using (var command = connection.CreateCommand())
+                {
+                    command.CommandText = "SELECT @@SPID";
+                    _spid = Convert.ToInt32(command.ExecuteScalar());
+                }
+            }
+            else
+            {
+                // includes SqlCE
+                _spid = 0;
+            }
+#endif
+
             // wrap the connection with a profiling connection that tracks timings
             return new StackExchange.Profiling.Data.ProfiledDbConnection(connection as DbConnection, MiniProfiler.Current);
         }
 
+#if DEBUG_DATABASES
+        public override void OnConnectionClosing(IDbConnection conn)
+        {
+            _spid = -1;
+        }
+#endif
+
         public override void OnException(Exception x)
         {
-            _logger.Error<UmbracoDatabase>("Database exception occurred", x);
+            _logger.Error<UmbracoDatabase>("Exception (" + InstanceSid + ").", x);
             base.OnException(x);
         }
 
@@ -132,14 +183,18 @@ namespace Umbraco.Core.Persistence
             if (EnableSqlTrace)
             {
                 var sb = new StringBuilder();
+#if DEBUG_DATABASES
+                sb.Append(InstanceSid);
+                sb.Append(": ");
+#endif
                 sb.Append(cmd.CommandText);
                 foreach (DbParameter p in cmd.Parameters)
                 {
                     sb.Append(" - ");
                     sb.Append(p.Value);
                 }
-                
-                _logger.Debug<UmbracoDatabase>(sb.ToString());
+
+                _logger.Debug<UmbracoDatabase>(sb.ToString().Replace("{", "{{").Replace("}", "}}"));
             }
 
             base.OnExecutingCommand(cmd);
@@ -185,9 +240,15 @@ namespace Umbraco.Core.Persistence
                     }
                 }
             }
-           
+
             //use the defaults
             base.BuildSqlDbSpecificPagingQuery(databaseType, skip, take, sql, sqlSelectRemoved, sqlOrderBy, ref args, out sqlPage);
         }
+
+        protected override void Dispose(bool disposing)
+        {
+            LogHelper.Debug<UmbracoDatabase>("Dispose (" + InstanceSid + ").");
+            if (DatabaseFactory != null) DatabaseFactory.OnDispose(this);
+        }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs
index e4574a7972..c6cdfb072a 100644
--- a/src/Umbraco.Core/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Core/UmbracoApplicationBase.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Core
     /// The abstract class for the Umbraco HttpApplication
     /// </summary>
     /// <remarks>
-    /// This is exposed in the core so that we can have the IApplicationEventHandler in the core project so that 
+    /// This is exposed in the core so that we can have the IApplicationEventHandler in the core project so that
     /// IApplicationEventHandler's can fire/execute outside of the web contenxt (i.e. in console applications)
     /// </remarks>
     public abstract class UmbracoApplicationBase : System.Web.HttpApplication
@@ -35,7 +35,7 @@ namespace Umbraco.Core
         /// </summary>
         internal void StartApplication(object sender, EventArgs e)
         {
-            //take care of unhandled exceptions - there is nothing we can do to 
+            //take care of unhandled exceptions - there is nothing we can do to
             // prevent the entire w3wp process to go down but at least we can try
             // and log the exception
             AppDomain.CurrentDomain.UnhandledException += (_, args) =>
@@ -59,6 +59,11 @@ namespace Umbraco.Core
 
             //And now we can dispose of our startup handlers - save some memory
             ApplicationEventsResolver.Current.Dispose();
+
+            // after Umbraco has started there is a database in "context" and that context is
+            // going to stay there and never get destroyed nor reused, so we have to ensure that
+            // the database is disposed (which will auto-remove it from context).
+            ApplicationContext.Current.DatabaseContext.Database.Dispose();
         }
 
         /// <summary>
@@ -121,7 +126,7 @@ namespace Umbraco.Core
                     throw;
                 }
             }
-                
+
         }
 
         /// <summary>
@@ -188,7 +193,7 @@ namespace Umbraco.Core
             {
                 return;
             }
-            
+
             Logger.Error<UmbracoApplicationBase>("An unhandled exception occurred", exc);
 
             OnApplicationError(sender, e);

From 6101b4eddebdd2d07a4f9ff217ddb919a2260eb9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 18 Nov 2016 09:27:17 +0100
Subject: [PATCH 07/52] U4-9201 - use UsingSafeDatabase where appropriate

---
 src/Umbraco.Web/Scheduling/LogScrubber.cs     |  4 +-
 .../Scheduling/ScheduledPublishing.cs         | 22 ++++---
 .../ServerRegistrationEventHandler.cs         | 14 +++--
 .../DataServices/UmbracoContentService.cs     | 60 +++++++++----------
 4 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index b3a5f303e3..da49404b4d 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -16,7 +16,7 @@ namespace Umbraco.Web.Scheduling
         private readonly ApplicationContext _appContext;
         private readonly IUmbracoSettingsSection _settings;
 
-        public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds, 
+        public LogScrubber(IBackgroundTaskRunner<RecurringTaskBase> runner, int delayMilliseconds, int periodMilliseconds,
             ApplicationContext appContext, IUmbracoSettingsSection settings)
             : base(runner, delayMilliseconds, periodMilliseconds)
         {
@@ -77,6 +77,8 @@ namespace Umbraco.Web.Scheduling
                 return false; // do NOT repeat, going down
             }
 
+            // running on a background task, requires a safe database (see UsingSafeDatabase doc)
+            using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
             using (DisposableTimer.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
             {
                 Log.CleanLogs(GetLogScrubbingMaximumAge(_settings));
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index 6649c3c474..dc6c27959d 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -29,7 +29,7 @@ namespace Umbraco.Web.Scheduling
         }
 
         public override async Task<bool> PerformRunAsync(CancellationToken token)
-        {            
+        {
             if (_appContext == null) return true; // repeat...
 
             switch (_appContext.GetCurrentServerRole())
@@ -70,19 +70,27 @@ namespace Umbraco.Web.Scheduling
             var url = umbracoAppUrl + "/RestServices/ScheduledPublish/Index";
 
             using (DisposableTimer.DebugDuration<ScheduledPublishing>(
-                () => string.Format("Scheduled publishing executing @ {0}", url), 
+                () => string.Format("Scheduled publishing executing @ {0}", url),
                 () => "Scheduled publishing complete"))
-            {                
+            {
                 try
-                {   
+                {
                     using (var wc = new HttpClient())
                     {
                         var request = new HttpRequestMessage(HttpMethod.Post, url)
                         {
                             Content = new StringContent(string.Empty)
                         };
-                        //pass custom the authorization header
-                        request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
+
+                        // running on a background task, requires a safe database (see UsingSafeDatabase doc)
+                        //
+                        // this is because GetAuthenticationHeaderValue uses UserService to load the current user, hence requires a database
+                        //
+                        using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
+                        {
+                            //pass custom the authorization header
+                            request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
+                        }
 
                         var result = await wc.SendAsync(request, token);
                     }
@@ -100,7 +108,7 @@ namespace Umbraco.Web.Scheduling
         {
             get { return true; }
         }
-    
+
         public override bool RunsOnShutdown
         {
             get { return false; }
diff --git a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
index a6dfa07be1..84b3e220ff 100644
--- a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
+++ b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
@@ -35,7 +35,7 @@ namespace Umbraco.Web.Strategies
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
         {
             _registrar = ServerRegistrarResolver.Current.Registrar as DatabaseServerRegistrar;
-            
+
             // only for the DatabaseServerRegistrar
             if (_registrar == null) return;
 
@@ -65,10 +65,10 @@ namespace Umbraco.Web.Strategies
                 case EnsureRoutableOutcome.IsRoutable:
                 case EnsureRoutableOutcome.NotDocumentRequest:
                     RegisterBackgroundTasks(e);
-                    break;                
+                    break;
             }
         }
-        
+
         private void RegisterBackgroundTasks(UmbracoRequestEventArgs e)
         {
             //remove handler, we're done
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Strategies
                     15000, //delay before first execution
                     _registrar.Options.RecurringSeconds*1000, //amount of ms between executions
                     svc, _registrar, serverAddress);
-                
+
                 //Perform the rest async, we don't want to block the startup sequence
                 // this will just reoccur on a background thread
                 _backgroundTaskRunner.TryAdd(task);
@@ -137,7 +137,11 @@ namespace Umbraco.Web.Strategies
             {
                 try
                 {
-                    _svc.TouchServer(_serverAddress, _svc.CurrentServerIdentity, _registrar.Options.StaleServerTimeout);
+                    // running on a background task, requires a safe database (see UsingSafeDatabase doc)
+                    using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
+                    {
+                        _svc.TouchServer(_serverAddress, _svc.CurrentServerIdentity, _registrar.Options.StaleServerTimeout);
+                    }
 
                     return true; // repeat
                 }
diff --git a/src/UmbracoExamine/DataServices/UmbracoContentService.cs b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
index 8f995a125e..4d2ea5bd9a 100644
--- a/src/UmbracoExamine/DataServices/UmbracoContentService.cs
+++ b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
@@ -1,26 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Security;
-using System.Text;
 using Umbraco.Core;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Models;
-using Umbraco.Core.Persistence;
-using Umbraco.Core.Persistence.UnitOfWork;
-using Umbraco.Core.Services;
-using umbraco;
 using System.Xml.Linq;
-using System.Xml;
-using umbraco.cms.businesslogic.web;
 using System.Collections;
 using System.Xml.XPath;
-using umbraco.DataLayer;
-using umbraco.BusinessLogic;
-using UmbracoExamine.Config;
 using Examine.LuceneEngine;
-using System.Data.SqlClient;
-using System.Diagnostics;
 
 namespace UmbracoExamine.DataServices
 {
@@ -31,9 +18,7 @@ namespace UmbracoExamine.DataServices
 
 		public UmbracoContentService()
 			: this(ApplicationContext.Current)
-		{
-
-		}
+		{ }
 
         public UmbracoContentService(ApplicationContext applicationContext)
 		{
@@ -73,13 +58,18 @@ namespace UmbracoExamine.DataServices
         [Obsolete("This should no longer be used, latest content will be indexed by using the IContentService directly")]
 		public XDocument GetLatestContentByXPath(string xpath)
         {
-            var xmlContent = XDocument.Parse("<content></content>");
-            foreach (var c in _applicationContext.Services.ContentService.GetRootContent())
+            using (_applicationContext.DatabaseContext.UsingSafeDatabase)
             {
-                xmlContent.Root.Add(c.ToDeepXml(_applicationContext.Services.PackagingService));				
+                var xmlContent = XDocument.Parse("<content></content>");
+                var rootContent = _applicationContext.Services.ContentService.GetRootContent();
+                foreach (var c in rootContent)
+                {
+                    // not sure this uses the database, but better be save
+                    xmlContent.Root.Add(c.ToDeepXml(_applicationContext.Services.PackagingService));
+                }
+                var result = ((IEnumerable)xmlContent.XPathEvaluate(xpath)).Cast<XElement>();
+                return result.ToXDocument();
             }
-            var result = ((IEnumerable)xmlContent.XPathEvaluate(xpath)).Cast<XElement>();
-            return result.ToXDocument();
         }
 
         /// <summary>
@@ -90,7 +80,10 @@ namespace UmbracoExamine.DataServices
         /// <returns></returns>
         public bool IsProtected(int nodeId, string path)
         {
-            return _applicationContext.Services.PublicAccessService.IsProtected(path.EnsureEndsWith("," + nodeId));
+            using (_applicationContext.DatabaseContext.UsingSafeDatabase)
+            {
+                return _applicationContext.Services.PublicAccessService.IsProtected(path.EnsureEndsWith("," + nodeId));
+            }
         }
 
 	    /// <summary>
@@ -100,16 +93,19 @@ namespace UmbracoExamine.DataServices
 		
 		public IEnumerable<string> GetAllUserPropertyNames()
 	    {
-            try
-            {
-                var result = _applicationContext.DatabaseContext.Database.Fetch<string>("select distinct alias from cmsPropertyType order by alias");
-                return result;
-            }
-            catch (Exception ex)
-            {
-                LogHelper.Error<UmbracoContentService>("EXCEPTION OCCURRED reading GetAllUserPropertyNames", ex);
-                return Enumerable.Empty<string>();
-            }      
+	        using (_applicationContext.DatabaseContext.UsingSafeDatabase)
+	        {
+	            try
+	            {
+	                var result = _applicationContext.DatabaseContext.Database.Fetch<string>("select distinct alias from cmsPropertyType order by alias");
+	                return result;
+	            }
+	            catch (Exception ex)
+	            {
+	                LogHelper.Error<UmbracoContentService>("EXCEPTION OCCURRED reading GetAllUserPropertyNames", ex);
+	                return Enumerable.Empty<string>();
+	            }
+	        }
 	    }
 
         /// <summary>

From c4d36f06f8e7d6024989b69ec727ffc2560d9aeb Mon Sep 17 00:00:00 2001
From: Damiaan <damiaan@comm-it.be>
Date: Fri, 18 Nov 2016 10:47:32 +0100
Subject: [PATCH 08/52] remove spaces behind ##

the github markdown will show ## at the end of the line if it is followed by a space
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 2758ad3edb..3e9be6cb5f 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Note that you can always [download a nightly build](http://nightly.umbraco.org/?
 
 [![ScreenShot](http://umbraco.com/images/whatisumbraco.png)](https://umbraco.tv/videos/umbraco-v7/content-editor/basics/introduction/cms-explanation/)
 
-## Umbraco - The Friendly CMS ## 
+## Umbraco - The Friendly CMS ##
 
 For the first time on the Microsoft platform, there is a free user and developer friendly CMS that makes it quick and easy to create websites - or a breeze to build complex web applications. Umbraco has award-winning integration capabilities and supports ASP.NET MVC or Web Forms, including User and Custom Controls, out of the box. 
 
@@ -30,7 +30,7 @@ Used by more than 350,000 active websites including Carlsberg, Segway, Amazon an
 
 To view more examples, please visit [https://umbraco.com/why-umbraco/#caseStudies](https://umbraco.com/why-umbraco/#caseStudies)
 
-## Why Open Source? ## 
+## Why Open Source? ##
 As an Open Source platform, Umbraco is more than just a CMS. We are transparent with our roadmap for future versions, our incremental sprint planning notes are publicly accessible and community contributions and packages are available for all to use.
 
 ## Downloading ##
@@ -49,4 +49,4 @@ Umbraco is contribution focused and community driven. If you want to contribute
 
 Another way you can contribute to Umbraco is by providing issue reports. For information on how to submit an issue report refer to our [online guide for reporting issues](https://our.umbraco.org/contribute/report-an-issue-or-request-a-feature).
 
-To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).
\ No newline at end of file
+To view existing issues, please visit [http://issues.umbraco.org](http://issues.umbraco.org).

From bad0d15c1c780ee50890613862dabd40c9691be7 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 18 Nov 2016 13:32:56 +0100
Subject: [PATCH 09/52] U4-9201 - troubleshoot

---
 src/Umbraco.Core/Persistence/UmbracoDatabase.cs | 1 +
 src/Umbraco.Core/UmbracoApplicationBase.cs      | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index 62cbfa78c4..4c7ba0b4c6 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -247,6 +247,7 @@ namespace Umbraco.Core.Persistence
 
         protected override void Dispose(bool disposing)
         {
+            base.Dispose(disposing);
             LogHelper.Debug<UmbracoDatabase>("Dispose (" + InstanceSid + ").");
             if (DatabaseFactory != null) DatabaseFactory.OnDispose(this);
         }
diff --git a/src/Umbraco.Core/UmbracoApplicationBase.cs b/src/Umbraco.Core/UmbracoApplicationBase.cs
index c6cdfb072a..1bf90fb154 100644
--- a/src/Umbraco.Core/UmbracoApplicationBase.cs
+++ b/src/Umbraco.Core/UmbracoApplicationBase.cs
@@ -63,7 +63,9 @@ namespace Umbraco.Core
             // after Umbraco has started there is a database in "context" and that context is
             // going to stay there and never get destroyed nor reused, so we have to ensure that
             // the database is disposed (which will auto-remove it from context).
-            ApplicationContext.Current.DatabaseContext.Database.Dispose();
+            var database = ApplicationContext.Current.DatabaseContext.Database;
+            if (database != null) // never to happen... unless in weird tests
+                ApplicationContext.Current.DatabaseContext.Database.Dispose();
         }
 
         /// <summary>

From 8ba6cb3abf6c5fe1ce965b35788c03ab1f60067b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 18 Nov 2016 13:38:49 +0100
Subject: [PATCH 10/52] Revert "Backport SafeCallContext,
 DefaultDatabaseFactory fixes from 7.6"

This reverts commit 59ace3d8814e74ece37de3d207b039edd608ee02.
---
 .../Packaging/PackageBinaryInspector.cs       |  50 +++--
 .../Persistence/DefaultDatabaseFactory.cs     | 186 +++++-------------
 src/Umbraco.Core/SafeCallContext.cs           |  94 ---------
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 -
 .../Persistence/DatabaseContextTests.cs       |   6 +-
 .../DataServices/UmbracoContentService.cs     |   1 +
 6 files changed, 78 insertions(+), 260 deletions(-)
 delete mode 100644 src/Umbraco.Core/SafeCallContext.cs

diff --git a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs b/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
index 116b5ee952..8852475543 100644
--- a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
+++ b/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
@@ -29,24 +29,20 @@ namespace Umbraco.Core.Packaging
         /// </remarks>
         public static IEnumerable<string> ScanAssembliesForTypeReference<T>(IEnumerable<byte[]> assemblys, out string[] errorReport)
         {
-            // beware! when toying with domains, use a safe call context!
-            using (new SafeCallContext())
+            var appDomain = GetTempAppDomain();
+            var type = typeof(PackageBinaryInspector);
+            try
             {
-                var appDomain = GetTempAppDomain();
-                var type = typeof(PackageBinaryInspector);
-                try
-                {
-                    var value = (PackageBinaryInspector) appDomain.CreateInstanceAndUnwrap(
-                        type.Assembly.FullName,
-                        type.FullName);
-                    // do NOT turn PerformScan into static (even if ReSharper says so)!
-                    var result = value.PerformScan<T>(assemblys.ToArray(), out errorReport);
-                    return result;
-                }
-                finally
-                {
-                    AppDomain.Unload(appDomain);
-                }
+                var value = (PackageBinaryInspector)appDomain.CreateInstanceAndUnwrap(
+                       type.Assembly.FullName,
+                       type.FullName);
+                // do NOT turn PerformScan into static (even if ReSharper says so)!
+                var result = value.PerformScan<T>(assemblys.ToArray(), out errorReport);
+                return result;
+            }
+            finally
+            {
+                AppDomain.Unload(appDomain);
             }
         }
 
@@ -82,7 +78,7 @@ namespace Umbraco.Core.Packaging
         /// <summary>
         /// Performs the assembly scanning
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T"></typeparam>        
         /// <param name="assemblies"></param>
         /// <param name="errorReport"></param>
         /// <returns></returns>
@@ -111,7 +107,7 @@ namespace Umbraco.Core.Packaging
         /// <summary>
         /// Performs the assembly scanning
         /// </summary>
-        /// <typeparam name="T"></typeparam>
+        /// <typeparam name="T"></typeparam>        
         /// <param name="dllPath"></param>
         /// <param name="errorReport"></param>
         /// <returns></returns>
@@ -158,7 +154,7 @@ namespace Umbraco.Core.Packaging
 
             //get the list of assembly names to compare below
             var loadedNames = loaded.Select(x => x.GetName().Name).ToArray();
-
+            
             //Then load each referenced assembly into the context
             foreach (var a in loaded)
             {
@@ -174,7 +170,7 @@ namespace Umbraco.Core.Packaging
                     }
                     catch (FileNotFoundException)
                     {
-                        //if an exception occurs it means that a referenced assembly could not be found
+                        //if an exception occurs it means that a referenced assembly could not be found                        
                         errors.Add(
                             string.Concat("This package references the assembly '",
                                           assemblyName.Name,
@@ -183,7 +179,7 @@ namespace Umbraco.Core.Packaging
                     }
                     catch (Exception ex)
                     {
-                        //if an exception occurs it means that a referenced assembly could not be found
+                        //if an exception occurs it means that a referenced assembly could not be found                        
                         errors.Add(
                             string.Concat("This package could not be verified for compatibility. An error occurred while loading a referenced assembly '",
                                           assemblyName.Name,
@@ -201,7 +197,7 @@ namespace Umbraco.Core.Packaging
             {
                 //now we need to see if they contain any type 'T'
                 var reflectedAssembly = a;
-
+                
                 try
                 {
                     var found = reflectedAssembly.GetExportedTypes()
@@ -214,8 +210,8 @@ namespace Umbraco.Core.Packaging
                 }
                 catch (Exception ex)
                 {
-                    //This is a hack that nobody can seem to get around, I've read everything and it seems that
-                    // this is quite a common thing when loading types into reflection only load context, so
+                    //This is a hack that nobody can seem to get around, I've read everything and it seems that 
+                    // this is quite a common thing when loading types into reflection only load context, so 
                     // we're just going to ignore this specific one for now
                     var typeLoadEx = ex as TypeLoadException;
                     if (typeLoadEx != null)
@@ -236,7 +232,7 @@ namespace Umbraco.Core.Packaging
                         LogHelper.Error<PackageBinaryInspector>("An error occurred scanning package assemblies", ex);
                     }
                 }
-
+                
             }
 
             errorReport = errors.ToArray();
@@ -256,7 +252,7 @@ namespace Umbraco.Core.Packaging
 
             var contractType = contractAssemblyLoadFrom.GetExportedTypes()
                 .FirstOrDefault(x => x.FullName == typeof(T).FullName && x.Assembly.FullName == typeof(T).Assembly.FullName);
-
+            
             if (contractType == null)
             {
                 throw new InvalidOperationException("Could not find type " + typeof(T) + " in the LoadFrom assemblies");
diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index c96b442e6e..658b8ebabe 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -1,6 +1,6 @@
 using System;
-using System.Runtime.Remoting.Messaging;
 using System.Web;
+using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Persistence
@@ -19,24 +19,13 @@ namespace Umbraco.Core.Persistence
 	    private readonly ILogger _logger;
 	    public string ConnectionString { get; private set; }
         public string ProviderName { get; private set; }
+        
+        //very important to have ThreadStatic:
+        // see: http://issues.umbraco.org/issue/U4-2172
+        [ThreadStatic]
+        private static volatile UmbracoDatabase _nonHttpInstance;
 
-        // NO! see notes in v8 HybridAccessorBase
-        //[ThreadStatic]
-        //private static volatile UmbracoDatabase _nonHttpInstance;
-
-        private const string ItemKey = "Umbraco.Core.Persistence.DefaultDatabaseFactory";
-
-        private static UmbracoDatabase NonContextValue
-        {
-            get { return (UmbracoDatabase) CallContext.LogicalGetData(ItemKey); }
-            set
-            {
-                if (value == null) CallContext.FreeNamedDataSlot(ItemKey);
-                else CallContext.LogicalSetData(ItemKey, value);
-            }
-        }
-
-        private static readonly object Locker = new object();
+		private static readonly object Locker = new object();
 
 	    /// <summary>
 	    /// Constructor accepting custom connection string
@@ -47,10 +36,7 @@ namespace Umbraco.Core.Persistence
 		{
 	        if (logger == null) throw new ArgumentNullException("logger");
 	        Mandate.ParameterNotNullOrEmpty(connectionStringName, "connectionStringName");
-
-            //if (NonContextValue != null) throw new Exception("NonContextValue is not null.");
-
-            _connectionStringName = connectionStringName;
+			_connectionStringName = connectionStringName;
 	        _logger = logger;
 		}
 
@@ -65,133 +51,65 @@ namespace Umbraco.Core.Persistence
 	        if (logger == null) throw new ArgumentNullException("logger");
 	        Mandate.ParameterNotNullOrEmpty(connectionString, "connectionString");
 			Mandate.ParameterNotNullOrEmpty(providerName, "providerName");
-
-            //if (NonContextValue != null) throw new Exception("NonContextValue is not null.");
-
-            ConnectionString = connectionString;
+			ConnectionString = connectionString;
 			ProviderName = providerName;
             _logger = logger;
 		}
 
 		public UmbracoDatabase CreateDatabase()
 		{
-            // no http context, create the call context object
-            // NOTHING is going to track the object and it is the responsibility of the caller to release it!
-            // using the ReleaseDatabase method.
-            if (HttpContext.Current == null)
-            {
-                LogHelper.Debug<DefaultDatabaseFactory>("Get NON http [T" + Environment.CurrentManagedThreadId + "]");
-                var value = NonContextValue;
-                if (value != null) return value;
-                lock (Locker)
-                {
-                    value = NonContextValue;
-                    if (value != null) return value;
+			//no http context, create the singleton global object
+			if (HttpContext.Current == null)
+			{
+                if (_nonHttpInstance == null)
+				{
+					lock (Locker)
+					{
+						//double check
+                        if (_nonHttpInstance == null)
+						{
+                            _nonHttpInstance = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+                                                  ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
+                                                  : new UmbracoDatabase(_connectionStringName, _logger);
+						}
+					}
+				}
+                return _nonHttpInstance;
+			}
 
-                    LogHelper.Debug<DefaultDatabaseFactory>("Create NON http [T" + Environment.CurrentManagedThreadId + "]");
-                    NonContextValue = value = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
-                                            ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
-                                            : new UmbracoDatabase(_connectionStringName, _logger);
-
-                    return value;
-                }
-            }
-
-            // we have an http context, so only create one per request.
-            // UmbracoDatabase is marked IDisposeOnRequestEnd and therefore will be disposed when
-            // UmbracoModule attempts to dispose the relevant HttpContext items. so we DO dispose
-            // connections at the end of each request. no need to call ReleaseDatabase.
-            LogHelper.Debug<DefaultDatabaseFactory>("Get http [T" + Environment.CurrentManagedThreadId + "]");
-            if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
-            {
-                LogHelper.Debug<DefaultDatabaseFactory>("Create http [T" + Environment.CurrentManagedThreadId + "]");
-                HttpContext.Current.Items.Add(typeof(DefaultDatabaseFactory),
-                                              string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+			//we have an http context, so only create one per request
+			if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
+			{
+			    HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory),
+			                                  string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
                                                   ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
                                                   : new UmbracoDatabase(_connectionStringName, _logger));
-            }
-            return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-        }
+			}
+			return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+		}
 
-        // releases the "context" database
-        public void ReleaseDatabase()
-        {
-            if (HttpContext.Current == null)
-            {
-                var value = NonContextValue;
-                if (value != null) value.Dispose();
-                NonContextValue = null;
-            }
-            else
-            {
-                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-                if (db != null) db.Dispose();
-                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
-            }
-        }
-
-        protected override void DisposeResources()
+		protected override void DisposeResources()
 		{
-            ReleaseDatabase();
+			if (HttpContext.Current == null)
+			{
+                _nonHttpInstance.Dispose();
+			}
+			else
+			{
+				if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)))
+				{
+					((UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)]).Dispose();
+				}
+			}
 		}
 
         // during tests, the thread static var can leak between tests
         // this method provides a way to force-reset the variable
 	    internal void ResetForTests()
 	    {
-            var value = NonContextValue;
-            if (value != null) value.Dispose();
-            NonContextValue = null;
-        }
-
-        #region SafeCallContext
-
-        // see notes in SafeCallContext - need to do this since we are using
-        // the logical call context...
-
-        static DefaultDatabaseFactory()
-        {
-            SafeCallContext.Register(DetachDatabase, AttachDatabase);
-        }
-
-        // detaches the current database
-        // ie returns the database and remove it from whatever is "context"
-        private static UmbracoDatabase DetachDatabase()
-        {
-            if (HttpContext.Current == null)
-            {
-                var db = NonContextValue;
-                NonContextValue = null;
-                return db;
-            }
-            else
-            {
-                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
-                return db;
-            }
-        }
-
-        // attach a current database
-        // ie assign it to whatever is "context"
-        // throws if there already is a database
-        private static void AttachDatabase(object o)
-        {
-            var database = o as UmbracoDatabase;
-            if (o != null && database == null) throw new ArgumentException("Not an UmbracoDatabase.", "o");
-
-            if (HttpContext.Current == null)
-            {
-                if (NonContextValue != null) throw new InvalidOperationException();
-                if (database != null) NonContextValue = database;
-            }
-            else
-            {
-                if (HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
-                if (database != null) HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] = database;
-            }
-        }
-
-        #endregion
-    }
+	        if (_nonHttpInstance == null) return;
+	        _nonHttpInstance.Dispose();
+	        _nonHttpInstance = null;
+	    }
+	}
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/SafeCallContext.cs b/src/Umbraco.Core/SafeCallContext.cs
deleted file mode 100644
index 5ed41d389f..0000000000
--- a/src/Umbraco.Core/SafeCallContext.cs
+++ /dev/null
@@ -1,94 +0,0 @@
-using System;
-using System.Linq;
-using System.Collections.Generic;
-
-namespace Umbraco.Core
-{
-    internal class SafeCallContext : IDisposable
-    {
-        private static readonly List<Func<object>> EnterFuncs = new List<Func<object>>();
-        private static readonly List<Action<object>> ExitActions = new List<Action<object>>();
-        private static int _count;
-        private readonly List<object> _objects;
-        private bool _disposed;
-
-        public static void Register(Func<object> enterFunc, Action<object> exitAction)
-        {
-            if (enterFunc == null) throw new ArgumentNullException("enterFunc");
-            if (exitAction == null) throw new ArgumentNullException("exitAction");
-
-            lock (EnterFuncs)
-            {
-                if (_count > 0) throw new InvalidOperationException("Cannot register while some SafeCallContext instances exist.");
-                EnterFuncs.Add(enterFunc);
-                ExitActions.Add(exitAction);
-            }
-        }
-
-        // tried to make the UmbracoDatabase serializable but then it leaks to weird places
-        // in ReSharper and so on, where Umbraco.Core is not available. Tried to serialize
-        // as an object instead but then it comes *back* deserialized into the original context
-        // as an object and of course it breaks everything. Cannot prevent this from flowing,
-        // and ExecutionContext.SuppressFlow() works for threads but not domains. and we'll
-        // have the same issue with anything that toys with logical call context...
-        //
-        // so this class lets anything that uses the logical call context register itself,
-        // providing two methods:
-        // - an enter func that removes and returns whatever is in the logical call context
-        // - an exit action that restores the value into the logical call context
-        // whenever a SafeCallContext instance is created, it uses these methods to capture
-        // and clear the logical call context, and restore it when disposed.
-        //
-        // in addition, a static Clear method is provided - which uses the enter funcs to
-        // remove everything from logical call context - not to be used when the app runs,
-        // but can be useful during tests
-        //
-        // note
-        // see System.Transactions
-        // they are using a conditional weak table to store the data, and what they store in
-        // LLC is the key - which is just an empty MarshalByRefObject that is created with
-        // the transaction scope - that way, they can "clear current data" provided that
-        // they have the key - but they need to hold onto a ref to the scope... not ok for us
-
-        public static void Clear()
-        {
-            lock (EnterFuncs)
-            {
-                foreach (var enter in EnterFuncs)
-                    enter();
-            }
-        }
-
-        public SafeCallContext()
-        {
-            lock (EnterFuncs)
-            {
-                _count++;
-                _objects = EnterFuncs.Select(x => x()).ToList();
-            }
-        }
-
-        public void Dispose()
-        {
-            if (_disposed) throw new ObjectDisposedException("this");
-            _disposed = true;
-            lock (EnterFuncs)
-            {
-                for (var i = 0; i < ExitActions.Count; i++)
-                    ExitActions[i](_objects[i]);
-                _count--;
-            }
-        }
-
-        // for unit tests ONLY
-        internal static void Reset()
-        {
-            lock (EnterFuncs)
-            {
-                if (_count > 0) throw new InvalidOperationException("Cannot reset while some SafeCallContext instances exist.");
-                EnterFuncs.Clear();
-                ExitActions.Clear();
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 5648d43dd2..7a4c4f2363 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -507,7 +507,6 @@
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />
-    <Compile Include="SafeCallContext.cs" />
     <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
     <Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index a9b016c2b6..94f0010201 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -23,8 +23,6 @@ namespace Umbraco.Tests.Persistence
 		[SetUp]
 		public void Setup()
 		{
-            SafeCallContext.Clear();
-
             _dbContext = new DatabaseContext(
                 new DefaultDatabaseFactory(Core.Configuration.GlobalSettings.UmbracoConnectionName, Mock.Of<ILogger>()),
                 Mock.Of<ILogger>(), new SqlCeSyntaxProvider(), Constants.DatabaseProviders.SqlCe);
@@ -36,7 +34,7 @@ namespace Umbraco.Tests.Persistence
 				{
 					DatabaseContext = _dbContext,
 					IsReady = true
-				};
+				};			
 		}
 
 		[TearDown]
@@ -101,7 +99,7 @@ namespace Umbraco.Tests.Persistence
 
             var appCtx = new ApplicationContext(
                 new DatabaseContext(Mock.Of<IDatabaseFactory>(), Mock.Of<ILogger>(), Mock.Of<ISqlSyntaxProvider>(), "test"),
-                new ServiceContext(migrationEntryService: Mock.Of<IMigrationEntryService>()),
+                new ServiceContext(migrationEntryService: Mock.Of<IMigrationEntryService>()), 
                 CacheHelper.CreateDisabledCacheHelper(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
 
diff --git a/src/UmbracoExamine/DataServices/UmbracoContentService.cs b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
index 8f995a125e..3cd94751ae 100644
--- a/src/UmbracoExamine/DataServices/UmbracoContentService.cs
+++ b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
@@ -102,6 +102,7 @@ namespace UmbracoExamine.DataServices
 	    {
             try
             {
+                
                 var result = _applicationContext.DatabaseContext.Database.Fetch<string>("select distinct alias from cmsPropertyType order by alias");
                 return result;
             }

From 93ee850bcc35a9a25ca187bfa786f0da158d8ebb Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 18 Nov 2016 13:48:18 +0100
Subject: [PATCH 11/52] publicize 2 events on UmbracoModule

---
 src/Umbraco.Web/BatchedDatabaseServerMessenger.cs   |  2 +-
 src/Umbraco.Web/BatchedWebServiceServerMessenger.cs |  3 ++-
 src/Umbraco.Web/Routing/EnsureRoutableOutcome.cs    |  2 +-
 src/Umbraco.Web/Routing/RoutableAttemptEventArgs.cs |  2 +-
 src/Umbraco.Web/Routing/UmbracoRequestEventArgs.cs  |  2 +-
 src/Umbraco.Web/UmbracoModule.cs                    | 13 +++++++------
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
index f06a7a332f..23edb2dde2 100644
--- a/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
+++ b/src/Umbraco.Web/BatchedDatabaseServerMessenger.cs
@@ -60,7 +60,7 @@ namespace Umbraco.Web
             }
         }
 
-        private void UmbracoModule_EndRequest(object sender, EventArgs e)
+        private void UmbracoModule_EndRequest(object sender, UmbracoRequestEventArgs e)
         {
             // will clear the batch - will remain in HttpContext though - that's ok
             FlushBatch();
diff --git a/src/Umbraco.Web/BatchedWebServiceServerMessenger.cs b/src/Umbraco.Web/BatchedWebServiceServerMessenger.cs
index 63536ca9f7..805c2393a8 100644
--- a/src/Umbraco.Web/BatchedWebServiceServerMessenger.cs
+++ b/src/Umbraco.Web/BatchedWebServiceServerMessenger.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Web;
 using Umbraco.Core.Sync;
+using Umbraco.Web.Routing;
 
 namespace Umbraco.Web
 {
@@ -64,7 +65,7 @@ namespace Umbraco.Web
             return batch;
         }
 
-        void UmbracoModule_EndRequest(object sender, EventArgs e)
+        void UmbracoModule_EndRequest(object sender, UmbracoRequestEventArgs e)
         {
             FlushBatch();
         }
diff --git a/src/Umbraco.Web/Routing/EnsureRoutableOutcome.cs b/src/Umbraco.Web/Routing/EnsureRoutableOutcome.cs
index fd09f5ff8c..3eefbc4d0c 100644
--- a/src/Umbraco.Web/Routing/EnsureRoutableOutcome.cs
+++ b/src/Umbraco.Web/Routing/EnsureRoutableOutcome.cs
@@ -3,7 +3,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Represents the outcome of trying to route an incoming request.
     /// </summary>
-    internal enum EnsureRoutableOutcome
+    public enum EnsureRoutableOutcome
     {
         /// <summary>
         /// Request routes to a document.
diff --git a/src/Umbraco.Web/Routing/RoutableAttemptEventArgs.cs b/src/Umbraco.Web/Routing/RoutableAttemptEventArgs.cs
index 7a7bc37d5c..ee93623252 100644
--- a/src/Umbraco.Web/Routing/RoutableAttemptEventArgs.cs
+++ b/src/Umbraco.Web/Routing/RoutableAttemptEventArgs.cs
@@ -5,7 +5,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Event args containing information about why the request was not routable, or if it is routable
     /// </summary>
-    internal class RoutableAttemptEventArgs : UmbracoRequestEventArgs
+    public class RoutableAttemptEventArgs : UmbracoRequestEventArgs
     {
         public EnsureRoutableOutcome Outcome { get; private set; }
 
diff --git a/src/Umbraco.Web/Routing/UmbracoRequestEventArgs.cs b/src/Umbraco.Web/Routing/UmbracoRequestEventArgs.cs
index 2c50c972f5..3516277275 100644
--- a/src/Umbraco.Web/Routing/UmbracoRequestEventArgs.cs
+++ b/src/Umbraco.Web/Routing/UmbracoRequestEventArgs.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Web.Routing
     /// <summary>
     /// Event args used for event launched during a request (like in the UmbracoModule)
     /// </summary>
-    internal class UmbracoRequestEventArgs : EventArgs
+    public class UmbracoRequestEventArgs : EventArgs
     {
         public UmbracoContext UmbracoContext { get; private set; }
         public HttpContextBase HttpContext { get; private set; }
diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs
index a80188f449..f2503b88c6 100644
--- a/src/Umbraco.Web/UmbracoModule.cs
+++ b/src/Umbraco.Web/UmbracoModule.cs
@@ -524,9 +524,9 @@ namespace Umbraco.Web
                             "Total milliseconds for umbraco request to process: {0}", () => DateTime.Now.Subtract(UmbracoContext.Current.ObjectCreated).TotalMilliseconds);
 					}
 
-                    OnEndRequest(new EventArgs());
+                    OnEndRequest(new UmbracoRequestEventArgs(UmbracoContext.Current, new HttpContextWrapper(httpContext)));
 
-					DisposeHttpContextItems(httpContext);
+                    DisposeHttpContextItems(httpContext);
 				};
 
 		}
@@ -536,18 +536,19 @@ namespace Umbraco.Web
 
 		}
 
-		#endregion
+        #endregion
 
         #region Events
-        internal static event EventHandler<RoutableAttemptEventArgs> RouteAttempt;
+
+        public static event EventHandler<RoutableAttemptEventArgs> RouteAttempt;
         private void OnRouteAttempt(RoutableAttemptEventArgs args)
         {
             if (RouteAttempt != null)
                 RouteAttempt(this, args);
         }
 
-        internal static event EventHandler<EventArgs> EndRequest;
-        private void OnEndRequest(EventArgs args)
+        public static event EventHandler<UmbracoRequestEventArgs> EndRequest;
+        private void OnEndRequest(UmbracoRequestEventArgs args)
         {
             if (EndRequest != null)
                 EndRequest(this, args);

From 0e57d558f671712c68b6c0d25e3993f23536ebc0 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 18 Nov 2016 14:20:54 +0100
Subject: [PATCH 12/52] updates cdf version

---
 src/Umbraco.Web.UI/Umbraco.Web.UI.csproj                 | 4 ++--
 src/Umbraco.Web.UI/packages.config                       | 2 +-
 src/Umbraco.Web/Umbraco.Web.csproj                       | 4 ++--
 src/Umbraco.Web/packages.config                          | 2 +-
 src/umbraco.cms/packages.config                          | 2 +-
 src/umbraco.cms/umbraco.cms.csproj                       | 4 ++--
 src/umbraco.controls/packages.config                     | 2 +-
 src/umbraco.controls/umbraco.controls.csproj             | 4 ++--
 src/umbraco.editorControls/packages.config               | 2 +-
 src/umbraco.editorControls/umbraco.editorControls.csproj | 4 ++--
 10 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index 791dd9b270..c8c90c2ed5 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -115,8 +115,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="ClientDependency.Core.Mvc, Version=1.8.0.0, Culture=neutral, processorArchitecture=MSIL">
diff --git a/src/Umbraco.Web.UI/packages.config b/src/Umbraco.Web.UI/packages.config
index 3850961ea8..008e5e404c 100644
--- a/src/Umbraco.Web.UI/packages.config
+++ b/src/Umbraco.Web.UI/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="ClientDependency-Mvc5" version="1.8.0.0" targetFramework="net45" />
   <package id="dotless" version="1.4.1.0" targetFramework="net45" />
   <package id="Examine" version="0.1.70.0" targetFramework="net45" />
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index cf188dab8e..02f973a13e 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -105,8 +105,8 @@
       <HintPath>..\packages\AutoMapper.3.3.1\lib\net40\AutoMapper.Net4.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="CookComputing.XmlRpcV2, Version=2.5.0.0, Culture=neutral, PublicKeyToken=a7d6e17aa302004d, processorArchitecture=MSIL">
diff --git a/src/Umbraco.Web/packages.config b/src/Umbraco.Web/packages.config
index 4f05967575..f8d737194e 100644
--- a/src/Umbraco.Web/packages.config
+++ b/src/Umbraco.Web/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="AutoMapper" version="3.3.1" targetFramework="net45" />
-  <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="dotless" version="1.4.1.0" targetFramework="net45" />
   <package id="Examine" version="0.1.70.0" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
diff --git a/src/umbraco.cms/packages.config b/src/umbraco.cms/packages.config
index 14db85833d..46e6d733a1 100644
--- a/src/umbraco.cms/packages.config
+++ b/src/umbraco.cms/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
   <package id="HtmlAgilityPack" version="1.4.9" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
   <package id="SharpZipLib" version="0.86.0" targetFramework="net45" />
diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj
index 2fd7a19ca9..3ed531db8e 100644
--- a/src/umbraco.cms/umbraco.cms.csproj
+++ b/src/umbraco.cms/umbraco.cms.csproj
@@ -106,8 +106,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="HtmlAgilityPack, Version=1.4.9.0, Culture=neutral, PublicKeyToken=bd319b19eaf3b43a, processorArchitecture=MSIL">
diff --git a/src/umbraco.controls/packages.config b/src/umbraco.controls/packages.config
index 016ca51b2d..eca7107322 100644
--- a/src/umbraco.controls/packages.config
+++ b/src/umbraco.controls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj
index a626c8a4dd..49fd505856 100644
--- a/src/umbraco.controls/umbraco.controls.csproj
+++ b/src/umbraco.controls/umbraco.controls.csproj
@@ -68,8 +68,8 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
diff --git a/src/umbraco.editorControls/packages.config b/src/umbraco.editorControls/packages.config
index 016ca51b2d..eca7107322 100644
--- a/src/umbraco.editorControls/packages.config
+++ b/src/umbraco.editorControls/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="ClientDependency" version="1.9.1" targetFramework="net45" />
+  <package id="ClientDependency" version="1.9.2" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj
index 15128a4d51..3bccb0b5f8 100644
--- a/src/umbraco.editorControls/umbraco.editorControls.csproj
+++ b/src/umbraco.editorControls/umbraco.editorControls.csproj
@@ -114,8 +114,8 @@
       <Project>{651E1350-91B6-44B7-BD60-7207006D7003}</Project>
       <Name>Umbraco.Web</Name>
     </ProjectReference>
-    <Reference Include="ClientDependency.Core, Version=1.9.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ClientDependency.1.9.1\lib\net45\ClientDependency.Core.dll</HintPath>
+    <Reference Include="ClientDependency.Core, Version=1.9.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ClientDependency.1.9.2\lib\net45\ClientDependency.Core.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System">

From 77e9643a09fda2b6293e77fd266facae0dd738ea Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Mon, 21 Nov 2016 08:17:18 +0100
Subject: [PATCH 13/52] Update NuGet CDF dependency

---
 build/NuSpecs/UmbracoCms.Core.nuspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build/NuSpecs/UmbracoCms.Core.nuspec b/build/NuSpecs/UmbracoCms.Core.nuspec
index 5e24fa66c5..7c1ff15cc8 100644
--- a/build/NuSpecs/UmbracoCms.Core.nuspec
+++ b/build/NuSpecs/UmbracoCms.Core.nuspec
@@ -27,7 +27,7 @@
       <dependency id="SharpZipLib" version="[0.86.0, 1.0.0)" />
       <dependency id="MySql.Data" version="[6.9.8, 7.0.0)" />
       <dependency id="xmlrpcnet" version="[2.5.0, 3.0.0)" />
-      <dependency id="ClientDependency" version="[1.9.1, 2.0.0)" />
+      <dependency id="ClientDependency" version="[1.9.2, 2.0.0)" />
       <dependency id="ClientDependency-Mvc5" version="[1.8.0, 2.0.0)" />
 	  <!-- AutoMapper can not be updated due to: https://github.com/AutoMapper/AutoMapper/issues/373#issuecomment-127644405 -->
       <dependency id="AutoMapper" version="[3.3.1, 4.0.0)" />

From d95f818e43a8845291d655b9310a4dfe317ae725 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 22 Nov 2016 14:02:53 +0100
Subject: [PATCH 14/52] Fixes U4-9212

---
 src/Umbraco.Web/Editors/MediaController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index 6604aee507..a12e91bd48 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -524,7 +524,7 @@ namespace Umbraco.Web.Editors
             //get the files
             foreach (var file in result.FileData)
             {
-                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' });
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"', ' ' });
                 var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
 
                 if (UmbracoConfig.For.UmbracoSettings().Content.DisallowedUploadFiles.Contains(ext) == false)

From a2a4ad39476f4a18c8fe2c04d42f6fa635551b63 Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Tue, 22 Nov 2016 14:31:29 +0100
Subject: [PATCH 15/52] Fixes U4-9212

---
 src/Umbraco.Web/Editors/MediaController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Editors/MediaController.cs b/src/Umbraco.Web/Editors/MediaController.cs
index a12e91bd48..7a7e349a3c 100644
--- a/src/Umbraco.Web/Editors/MediaController.cs
+++ b/src/Umbraco.Web/Editors/MediaController.cs
@@ -524,7 +524,7 @@ namespace Umbraco.Web.Editors
             //get the files
             foreach (var file in result.FileData)
             {
-                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"', ' ' });
+                var fileName = file.Headers.ContentDisposition.FileName.Trim(new[] { '\"' }).TrimEnd();
                 var ext = fileName.Substring(fileName.LastIndexOf('.') + 1).ToLower();
 
                 if (UmbracoConfig.For.UmbracoSettings().Content.DisallowedUploadFiles.Contains(ext) == false)

From e9b217550658ccba3347a4251ee41dae134c6362 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 22 Nov 2016 15:16:07 +0100
Subject: [PATCH 16/52] Fixes null check problem in
 ExamineEvents.ContentTypeCacheRefresherCacheUpdated

---
 src/Umbraco.Web/Search/ExamineEvents.cs | 27 ++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Web/Search/ExamineEvents.cs b/src/Umbraco.Web/Search/ExamineEvents.cs
index d02850bffe..7fbbf29b89 100644
--- a/src/Umbraco.Web/Search/ExamineEvents.cs
+++ b/src/Umbraco.Web/Search/ExamineEvents.cs
@@ -122,10 +122,13 @@ namespace Umbraco.Web.Search
                     foreach (var alias in contentTypesChanged)
                     {
                         var ctType = ApplicationContext.Current.Services.ContentTypeService.GetContentType(alias);
-                        var contentItems = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(ctType.Id);
-                        foreach (var contentItem in contentItems)
+                        if (ctType != null)
                         {
-                            ReIndexForContent(contentItem, contentItem.HasPublishedVersion && contentItem.Trashed == false);
+                            var contentItems = ApplicationContext.Current.Services.ContentService.GetContentOfContentType(ctType.Id);
+                            foreach (var contentItem in contentItems)
+                            {
+                                ReIndexForContent(contentItem, contentItem.HasPublishedVersion && contentItem.Trashed == false);
+                            }
                         }                        
                     }                    
                 }
@@ -134,10 +137,13 @@ namespace Umbraco.Web.Search
                     foreach (var alias in mediaTypesChanged)
                     {
                         var ctType = ApplicationContext.Current.Services.ContentTypeService.GetMediaType(alias);
-                        var mediaItems = ApplicationContext.Current.Services.MediaService.GetMediaOfMediaType(ctType.Id);
-                        foreach (var mediaItem in mediaItems)
+                        if (ctType != null)
                         {
-                            ReIndexForMedia(mediaItem, mediaItem.Trashed == false);
+                            var mediaItems = ApplicationContext.Current.Services.MediaService.GetMediaOfMediaType(ctType.Id);
+                            foreach (var mediaItem in mediaItems)
+                            {
+                                ReIndexForMedia(mediaItem, mediaItem.Trashed == false);
+                            }
                         }
                     }
                 }
@@ -146,10 +152,13 @@ namespace Umbraco.Web.Search
                     foreach (var alias in memberTypesChanged)
                     {
                         var ctType = ApplicationContext.Current.Services.MemberTypeService.Get(alias);
-                        var memberItems = ApplicationContext.Current.Services.MemberService.GetMembersByMemberType(ctType.Id);
-                        foreach (var memberItem in memberItems)
+                        if (ctType != null)
                         {
-                            ReIndexForMember(memberItem);
+                            var memberItems = ApplicationContext.Current.Services.MemberService.GetMembersByMemberType(ctType.Id);
+                            foreach (var memberItem in memberItems)
+                            {
+                                ReIndexForMember(memberItem);
+                            }
                         }
                     }
                 }

From 1def61432eb2e15539c6a9a092977e86fb701d67 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 23 Nov 2016 10:58:52 +0100
Subject: [PATCH 17/52] U4-9216 - fix saving containers

---
 src/Umbraco.Core/Services/ContentTypeService.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentTypeService.cs b/src/Umbraco.Core/Services/ContentTypeService.cs
index d80a93a4ab..31e86cd128 100644
--- a/src/Umbraco.Core/Services/ContentTypeService.cs
+++ b/src/Umbraco.Core/Services/ContentTypeService.cs
@@ -141,7 +141,7 @@ namespace Umbraco.Core.Services
         {
             var evtMsgs = EventMessagesFactory.Get();
 
-            if (container.ContainedObjectType != containerObjectType)
+            if (container.ContainerObjectType != containerObjectType)
             {
                 var ex = new InvalidOperationException("Not a " + objectTypeName + " container.");
                 return OperationStatus.Exception(evtMsgs, ex);
@@ -799,7 +799,7 @@ namespace Umbraco.Core.Services
                     // of a different type, move them to the recycle bin, then permanently delete the content items.
                     // The main problem with this is that for every content item being deleted, events are raised...
                     // which we need for many things like keeping caches in sync, but we can surely do this MUCH better.
-                    
+
                     var deletedContentTypes = new List<IContentType>() {contentType};
                     deletedContentTypes.AddRange(contentType.Descendants().OfType<IContentType>());
 
@@ -807,7 +807,7 @@ namespace Umbraco.Core.Services
                     {
                         _contentService.DeleteContentOfType(deletedContentType.Id);
                     }
-                    
+
                     repository.Delete(contentType);
                     uow.Commit();
 

From 5784ea96e751f78af7c405cfdb477829f7feca7c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 23 Nov 2016 11:26:30 +0100
Subject: [PATCH 18/52] UnRevert "Backport SafeCallContext,
 DefaultDatabaseFactory fixes from 7.6"

This reverts commit 8ba6cb3abf6c5fe1ce965b35788c03ab1f60067b.
---
 .../Packaging/PackageBinaryInspector.cs       |  50 ++---
 .../Persistence/DefaultDatabaseFactory.cs     | 186 +++++++++++++-----
 src/Umbraco.Core/SafeCallContext.cs           |  94 +++++++++
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 .../Persistence/DatabaseContextTests.cs       |   4 +-
 .../DataServices/UmbracoContentService.cs     |   1 -
 6 files changed, 258 insertions(+), 78 deletions(-)
 create mode 100644 src/Umbraco.Core/SafeCallContext.cs

diff --git a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs b/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
index 9307e74f21..57664b8a83 100644
--- a/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
+++ b/src/Umbraco.Core/Packaging/PackageBinaryInspector.cs
@@ -29,20 +29,24 @@ namespace Umbraco.Core.Packaging
         /// </remarks>
         public static IEnumerable<string> ScanAssembliesForTypeReference<T>(IEnumerable<byte[]> assemblys, out string[] errorReport)
         {
-            var appDomain = GetTempAppDomain();
-            var type = typeof(PackageBinaryInspector);
-            try
+            // beware! when toying with domains, use a safe call context!
+            using (new SafeCallContext())
             {
-                var value = (PackageBinaryInspector)appDomain.CreateInstanceAndUnwrap(
-                       type.Assembly.FullName,
-                       type.FullName);
-                // do NOT turn PerformScan into static (even if ReSharper says so)!
-                var result = value.PerformScan<T>(assemblys.ToArray(), out errorReport);
-                return result;
-            }
-            finally
-            {
-                AppDomain.Unload(appDomain);
+                var appDomain = GetTempAppDomain();
+                var type = typeof(PackageBinaryInspector);
+                try
+                {
+                    var value = (PackageBinaryInspector) appDomain.CreateInstanceAndUnwrap(
+                        type.Assembly.FullName,
+                        type.FullName);
+                    // do NOT turn PerformScan into static (even if ReSharper says so)!
+                    var result = value.PerformScan<T>(assemblys.ToArray(), out errorReport);
+                    return result;
+                }
+                finally
+                {
+                    AppDomain.Unload(appDomain);
+                }
             }
         }
 
@@ -78,7 +82,7 @@ namespace Umbraco.Core.Packaging
         /// <summary>
         /// Performs the assembly scanning
         /// </summary>
-        /// <typeparam name="T"></typeparam>        
+        /// <typeparam name="T"></typeparam>
         /// <param name="assemblies"></param>
         /// <param name="errorReport"></param>
         /// <returns></returns>
@@ -107,7 +111,7 @@ namespace Umbraco.Core.Packaging
         /// <summary>
         /// Performs the assembly scanning
         /// </summary>
-        /// <typeparam name="T"></typeparam>        
+        /// <typeparam name="T"></typeparam>
         /// <param name="dllPath"></param>
         /// <param name="errorReport"></param>
         /// <returns></returns>
@@ -154,7 +158,7 @@ namespace Umbraco.Core.Packaging
 
             //get the list of assembly names to compare below
             var loadedNames = loaded.Select(x => x.GetName().Name).ToArray();
-            
+
             //Then load each referenced assembly into the context
             foreach (var a in loaded)
             {
@@ -170,7 +174,7 @@ namespace Umbraco.Core.Packaging
                     }
                     catch (FileNotFoundException)
                     {
-                        //if an exception occurs it means that a referenced assembly could not be found                        
+                        //if an exception occurs it means that a referenced assembly could not be found
                         errors.Add(
                             string.Concat("This package references the assembly '",
                                           assemblyName.Name,
@@ -179,7 +183,7 @@ namespace Umbraco.Core.Packaging
                     }
                     catch (Exception ex)
                     {
-                        //if an exception occurs it means that a referenced assembly could not be found                        
+                        //if an exception occurs it means that a referenced assembly could not be found
                         errors.Add(
                             string.Concat("This package could not be verified for compatibility. An error occurred while loading a referenced assembly '",
                                           assemblyName.Name,
@@ -197,7 +201,7 @@ namespace Umbraco.Core.Packaging
             {
                 //now we need to see if they contain any type 'T'
                 var reflectedAssembly = a;
-                
+
                 try
                 {
                     var found = reflectedAssembly.GetExportedTypes()
@@ -210,8 +214,8 @@ namespace Umbraco.Core.Packaging
                 }
                 catch (Exception ex)
                 {
-                    //This is a hack that nobody can seem to get around, I've read everything and it seems that 
-                    // this is quite a common thing when loading types into reflection only load context, so 
+                    //This is a hack that nobody can seem to get around, I've read everything and it seems that
+                    // this is quite a common thing when loading types into reflection only load context, so
                     // we're just going to ignore this specific one for now
                     var typeLoadEx = ex as TypeLoadException;
                     if (typeLoadEx != null)
@@ -232,7 +236,7 @@ namespace Umbraco.Core.Packaging
                         LogHelper.Error<PackageBinaryInspector>("An error occurred scanning package assemblies", ex);
                     }
                 }
-                
+
             }
 
             errorReport = errors.ToArray();
@@ -252,7 +256,7 @@ namespace Umbraco.Core.Packaging
 
             var contractType = contractAssemblyLoadFrom.GetExportedTypes()
                 .FirstOrDefault(x => x.FullName == typeof(T).FullName && x.Assembly.FullName == typeof(T).Assembly.FullName);
-            
+
             if (contractType == null)
             {
                 throw new InvalidOperationException("Could not find type " + typeof(T) + " in the LoadFrom assemblies");
diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index 8b78f290b3..4ad425d9c9 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -1,6 +1,6 @@
 using System;
+using System.Runtime.Remoting.Messaging;
 using System.Web;
-using Umbraco.Core.Configuration;
 using Umbraco.Core.Logging;
 
 namespace Umbraco.Core.Persistence
@@ -19,13 +19,24 @@ namespace Umbraco.Core.Persistence
 	    private readonly ILogger _logger;
 	    public string ConnectionString { get; private set; }
         public string ProviderName { get; private set; }
-        
-        //very important to have ThreadStatic:
-        // see: http://issues.umbraco.org/issue/U4-2172
-        [ThreadStatic]
-        private static volatile UmbracoDatabase _nonHttpInstance;
 
-		private static readonly object Locker = new object();
+        // NO! see notes in v8 HybridAccessorBase
+        //[ThreadStatic]
+        //private static volatile UmbracoDatabase _nonHttpInstance;
+
+        private const string ItemKey = "Umbraco.Core.Persistence.DefaultDatabaseFactory";
+
+        private static UmbracoDatabase NonContextValue
+        {
+            get { return (UmbracoDatabase) CallContext.LogicalGetData(ItemKey); }
+            set
+            {
+                if (value == null) CallContext.FreeNamedDataSlot(ItemKey);
+                else CallContext.LogicalSetData(ItemKey, value);
+            }
+        }
+
+        private static readonly object Locker = new object();
 
 	    /// <summary>
 	    /// Constructor accepting custom connection string
@@ -36,7 +47,10 @@ namespace Umbraco.Core.Persistence
 		{
             if (logger == null) throw new ArgumentNullException("logger");
 	        Mandate.ParameterNotNullOrEmpty(connectionStringName, "connectionStringName");
-			_connectionStringName = connectionStringName;
+
+            //if (NonContextValue != null) throw new Exception("NonContextValue is not null.");
+
+            _connectionStringName = connectionStringName;
 	        _logger = logger;
 		}
 
@@ -51,65 +65,133 @@ namespace Umbraco.Core.Persistence
             if (logger == null) throw new ArgumentNullException("logger");
 	        Mandate.ParameterNotNullOrEmpty(connectionString, "connectionString");
 			Mandate.ParameterNotNullOrEmpty(providerName, "providerName");
-			ConnectionString = connectionString;
+
+            //if (NonContextValue != null) throw new Exception("NonContextValue is not null.");
+
+            ConnectionString = connectionString;
 			ProviderName = providerName;
             _logger = logger;
 		}
 
 		public UmbracoDatabase CreateDatabase()
 		{
-			//no http context, create the singleton global object
-			if (HttpContext.Current == null)
-			{
-                if (_nonHttpInstance == null)
-				{
-					lock (Locker)
-					{
-						//double check
-                        if (_nonHttpInstance == null)
-						{
-                            _nonHttpInstance = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
-                                                  ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
-                                                  : new UmbracoDatabase(_connectionStringName, _logger);
-						}
-					}
-				}
-                return _nonHttpInstance;
-			}
+            // no http context, create the call context object
+            // NOTHING is going to track the object and it is the responsibility of the caller to release it!
+            // using the ReleaseDatabase method.
+            if (HttpContext.Current == null)
+            {
+                LogHelper.Debug<DefaultDatabaseFactory>("Get NON http [T" + Environment.CurrentManagedThreadId + "]");
+                var value = NonContextValue;
+                if (value != null) return value;
+                lock (Locker)
+                {
+                    value = NonContextValue;
+                    if (value != null) return value;
 
-			//we have an http context, so only create one per request
-			if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
-			{
-			    HttpContext.Current.Items.Add(typeof (DefaultDatabaseFactory),
-			                                  string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+                    LogHelper.Debug<DefaultDatabaseFactory>("Create NON http [T" + Environment.CurrentManagedThreadId + "]");
+                    NonContextValue = value = string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
+                                            ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
+                                            : new UmbracoDatabase(_connectionStringName, _logger);
+
+                    return value;
+                }
+            }
+
+            // we have an http context, so only create one per request.
+            // UmbracoDatabase is marked IDisposeOnRequestEnd and therefore will be disposed when
+            // UmbracoModule attempts to dispose the relevant HttpContext items. so we DO dispose
+            // connections at the end of each request. no need to call ReleaseDatabase.
+            LogHelper.Debug<DefaultDatabaseFactory>("Get http [T" + Environment.CurrentManagedThreadId + "]");
+            if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)) == false)
+            {
+                LogHelper.Debug<DefaultDatabaseFactory>("Create http [T" + Environment.CurrentManagedThreadId + "]");
+                HttpContext.Current.Items.Add(typeof(DefaultDatabaseFactory),
+                                              string.IsNullOrEmpty(ConnectionString) == false && string.IsNullOrEmpty(ProviderName) == false
                                                   ? new UmbracoDatabase(ConnectionString, ProviderName, _logger)
                                                   : new UmbracoDatabase(_connectionStringName, _logger));
-			}
-			return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
-		}
+            }
+            return (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+        }
 
-		protected override void DisposeResources()
+        // releases the "context" database
+        public void ReleaseDatabase()
+        {
+            if (HttpContext.Current == null)
+            {
+                var value = NonContextValue;
+                if (value != null) value.Dispose();
+                NonContextValue = null;
+            }
+            else
+            {
+                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+                if (db != null) db.Dispose();
+                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
+            }
+        }
+
+        protected override void DisposeResources()
 		{
-			if (HttpContext.Current == null)
-			{
-                _nonHttpInstance.Dispose();
-			}
-			else
-			{
-				if (HttpContext.Current.Items.Contains(typeof(DefaultDatabaseFactory)))
-				{
-					((UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)]).Dispose();
-				}
-			}
+            ReleaseDatabase();
 		}
 
         // during tests, the thread static var can leak between tests
         // this method provides a way to force-reset the variable
 	    internal void ResetForTests()
 	    {
-	        if (_nonHttpInstance == null) return;
-	        _nonHttpInstance.Dispose();
-	        _nonHttpInstance = null;
-	    }
-	}
+            var value = NonContextValue;
+            if (value != null) value.Dispose();
+            NonContextValue = null;
+        }
+
+        #region SafeCallContext
+
+        // see notes in SafeCallContext - need to do this since we are using
+        // the logical call context...
+
+        static DefaultDatabaseFactory()
+        {
+            SafeCallContext.Register(DetachDatabase, AttachDatabase);
+        }
+
+        // detaches the current database
+        // ie returns the database and remove it from whatever is "context"
+        private static UmbracoDatabase DetachDatabase()
+        {
+            if (HttpContext.Current == null)
+            {
+                var db = NonContextValue;
+                NonContextValue = null;
+                return db;
+            }
+            else
+            {
+                var db = (UmbracoDatabase)HttpContext.Current.Items[typeof(DefaultDatabaseFactory)];
+                HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
+                return db;
+            }
+        }
+
+        // attach a current database
+        // ie assign it to whatever is "context"
+        // throws if there already is a database
+        private static void AttachDatabase(object o)
+        {
+            var database = o as UmbracoDatabase;
+            if (o != null && database == null) throw new ArgumentException("Not an UmbracoDatabase.", "o");
+
+            if (HttpContext.Current == null)
+            {
+                if (NonContextValue != null) throw new InvalidOperationException();
+                if (database != null) NonContextValue = database;
+            }
+            else
+            {
+                if (HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
+                if (database != null) HttpContext.Current.Items[typeof(DefaultDatabaseFactory)] = database;
+            }
+        }
+
+        #endregion
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/SafeCallContext.cs b/src/Umbraco.Core/SafeCallContext.cs
new file mode 100644
index 0000000000..5ed41d389f
--- /dev/null
+++ b/src/Umbraco.Core/SafeCallContext.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Linq;
+using System.Collections.Generic;
+
+namespace Umbraco.Core
+{
+    internal class SafeCallContext : IDisposable
+    {
+        private static readonly List<Func<object>> EnterFuncs = new List<Func<object>>();
+        private static readonly List<Action<object>> ExitActions = new List<Action<object>>();
+        private static int _count;
+        private readonly List<object> _objects;
+        private bool _disposed;
+
+        public static void Register(Func<object> enterFunc, Action<object> exitAction)
+        {
+            if (enterFunc == null) throw new ArgumentNullException("enterFunc");
+            if (exitAction == null) throw new ArgumentNullException("exitAction");
+
+            lock (EnterFuncs)
+            {
+                if (_count > 0) throw new InvalidOperationException("Cannot register while some SafeCallContext instances exist.");
+                EnterFuncs.Add(enterFunc);
+                ExitActions.Add(exitAction);
+            }
+        }
+
+        // tried to make the UmbracoDatabase serializable but then it leaks to weird places
+        // in ReSharper and so on, where Umbraco.Core is not available. Tried to serialize
+        // as an object instead but then it comes *back* deserialized into the original context
+        // as an object and of course it breaks everything. Cannot prevent this from flowing,
+        // and ExecutionContext.SuppressFlow() works for threads but not domains. and we'll
+        // have the same issue with anything that toys with logical call context...
+        //
+        // so this class lets anything that uses the logical call context register itself,
+        // providing two methods:
+        // - an enter func that removes and returns whatever is in the logical call context
+        // - an exit action that restores the value into the logical call context
+        // whenever a SafeCallContext instance is created, it uses these methods to capture
+        // and clear the logical call context, and restore it when disposed.
+        //
+        // in addition, a static Clear method is provided - which uses the enter funcs to
+        // remove everything from logical call context - not to be used when the app runs,
+        // but can be useful during tests
+        //
+        // note
+        // see System.Transactions
+        // they are using a conditional weak table to store the data, and what they store in
+        // LLC is the key - which is just an empty MarshalByRefObject that is created with
+        // the transaction scope - that way, they can "clear current data" provided that
+        // they have the key - but they need to hold onto a ref to the scope... not ok for us
+
+        public static void Clear()
+        {
+            lock (EnterFuncs)
+            {
+                foreach (var enter in EnterFuncs)
+                    enter();
+            }
+        }
+
+        public SafeCallContext()
+        {
+            lock (EnterFuncs)
+            {
+                _count++;
+                _objects = EnterFuncs.Select(x => x()).ToList();
+            }
+        }
+
+        public void Dispose()
+        {
+            if (_disposed) throw new ObjectDisposedException("this");
+            _disposed = true;
+            lock (EnterFuncs)
+            {
+                for (var i = 0; i < ExitActions.Count; i++)
+                    ExitActions[i](_objects[i]);
+                _count--;
+            }
+        }
+
+        // for unit tests ONLY
+        internal static void Reset()
+        {
+            lock (EnterFuncs)
+            {
+                if (_count > 0) throw new InvalidOperationException("Cannot reset while some SafeCallContext instances exist.");
+                EnterFuncs.Clear();
+                ExitActions.Clear();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e180ed7efc..6da7f4519b 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -523,6 +523,7 @@
     <Compile Include="PropertyEditors\ValueConverters\ImageCropperValueConverter.cs" />
     <Compile Include="Publishing\UnPublishedStatusType.cs" />
     <Compile Include="Publishing\UnPublishStatus.cs" />
+    <Compile Include="SafeCallContext.cs" />
     <Compile Include="Security\ActiveDirectoryBackOfficeUserPasswordChecker.cs" />
     <Compile Include="Security\BackOfficeClaimsIdentityFactory.cs" />
     <Compile Include="Security\BackOfficeCookieAuthenticationProvider.cs" />
diff --git a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
index 5919d23acc..1b42daa47c 100644
--- a/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
+++ b/src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
@@ -37,7 +37,7 @@ namespace Umbraco.Tests.Persistence
 				{
 					DatabaseContext = _dbContext,
 					IsReady = true
-				};			
+				};
 		}
 
 		[TearDown]
@@ -102,7 +102,7 @@ namespace Umbraco.Tests.Persistence
 
             var appCtx = new ApplicationContext(
                 _dbContext,
-                new ServiceContext(migrationEntryService: Mock.Of<IMigrationEntryService>()), 
+                new ServiceContext(migrationEntryService: Mock.Of<IMigrationEntryService>()),
                 CacheHelper.CreateDisabledCacheHelper(),
                 new ProfilingLogger(Mock.Of<ILogger>(), Mock.Of<IProfiler>()));
 
diff --git a/src/UmbracoExamine/DataServices/UmbracoContentService.cs b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
index 3cd94751ae..8f995a125e 100644
--- a/src/UmbracoExamine/DataServices/UmbracoContentService.cs
+++ b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
@@ -102,7 +102,6 @@ namespace UmbracoExamine.DataServices
 	    {
             try
             {
-                
                 var result = _applicationContext.DatabaseContext.Database.Fetch<string>("select distinct alias from cmsPropertyType order by alias");
                 return result;
             }

From 47c8e6854ee2aafc99fa7fc0b7d901fc59020adb Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Wed, 23 Nov 2016 14:24:08 +0100
Subject: [PATCH 19/52] Fixes: U4-9217 - Sanitize tags before storing them in
 the database

---
 .../src/views/propertyeditors/tags/tags.controller.js          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index a1e48bbc99..d18ff73bd5 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -1,6 +1,6 @@
 angular.module("umbraco")
 .controller("Umbraco.PropertyEditors.TagsController",
-    function ($rootScope, $scope, $log, assetsService, umbRequestHelper, angularHelper, $timeout, $element) {
+    function ($rootScope, $scope, $log, assetsService, umbRequestHelper, angularHelper, $timeout, $element, $sanitize) {
 
         var $typeahead;
 
@@ -41,6 +41,7 @@ angular.module("umbraco")
 
             //Helper method to add a tag on enter or on typeahead select
             function addTag(tagToAdd) {
+                tagToAdd = $sanitize(tagToAdd);
                 if (tagToAdd != null && tagToAdd.length > 0) {
                     if ($scope.model.value.indexOf(tagToAdd) < 0) {
                         $scope.model.value.push(tagToAdd);

From 0689bf4f311cf44d374701d2a493a2dee2b3bfbc Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 23 Nov 2016 15:26:41 +0100
Subject: [PATCH 20/52] U4-9201 - fix it all

---
 src/Umbraco.Core/DatabaseContext.cs           | 60 ++++++++++---------
 .../Persistence/DefaultDatabaseFactory.cs     | 18 +++++-
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 src/Umbraco.Web/Scheduling/LogScrubber.cs     |  2 +-
 .../Scheduling/ScheduledPublishing.cs         |  6 +-
 .../ServerRegistrationEventHandler.cs         |  2 +-
 .../DataServices/UmbracoContentService.cs     |  9 ++-
 7 files changed, 56 insertions(+), 43 deletions(-)

diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index f8f31ee695..27013d8ecd 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -94,13 +94,13 @@ namespace Umbraco.Core
         public ISqlSyntaxProvider SqlSyntax { get; private set; }
 
         /// <summary>
-        /// Gets the <see cref="Database"/> object for doing CRUD operations against custom tables that resides in the Umbraco database.
+        /// Gets an "ambient" database for doing CRUD operations against custom tables that resides in the Umbraco database.
         /// </summary>
         /// <remarks>
         /// <para>Should not be used for operation against standard Umbraco tables; as services should be used instead.</para>
         /// <para>Gets or creates an "ambient" database that is either stored in http context + available for the whole
-        /// request + auto-disposed at the end of the request, or in call context if there is no http context - in which
-        /// case it needs to be explicitely disposed so it is removed from call context.</para>
+        /// request + auto-disposed at the end of the request, or stored in call context if there is no http context - in which
+        /// case it *must* be explicitely disposed (which will remove it from call context).</para>
         /// </remarks>
         public virtual UmbracoDatabase Database
         {
@@ -108,24 +108,32 @@ namespace Umbraco.Core
         }
 
         /// <summary>
-        /// Replaces the "ambient" database (if any) and installs a new <see cref="Database"/> object.
+        /// Replaces the "ambient" database (if any) and by a new temp database.
         /// </summary>
         /// <remarks>
-        /// <para>The returned IDisposable *must* be diposed in order to properly disposed the safe database and
+        /// <para>The returned IDisposable *must* be diposed in order to properly dispose the temp database and
         /// restore the original "ambient" database (if any).</para>
         /// <para>This is to be used in background tasks to ensure that they have an "ambient" database which
         /// will be properly removed from call context and does not interfere with anything else. In most case
         /// it is not replacing anything, just temporarily installing a database in context.</para>
         /// </remarks>
-        public virtual IDisposable UsingSafeDatabase
+        public virtual IDisposable UseSafeDatabase(bool force = false)
         {
-            get
+            var factory = _factory as DefaultDatabaseFactory;
+            if (factory == null) throw new NotSupportedException();
+            if (DefaultDatabaseFactory.HasAmbientDatabase)
             {
-                var factory = _factory as DefaultDatabaseFactory;
-                if (factory == null) throw new NotSupportedException();
-                var database = factory.CreateDatabaseInstance(DefaultDatabaseFactory.ContextOwner.None);
-                return new UsedDatabase(database, _logger);
+                // has ambient,
+                // if forcing, detach it and replace it with a new, temp, database
+                //  when the UsingDatabase is disposed, the temp database is disposed and the original one is re-instated
+                // else do nothing (and nothing will be disposed)
+                return force
+                    ? new UsingDatabase(DefaultDatabaseFactory.DetachAmbientDatabase(), factory.CreateDatabase())
+                    : new UsingDatabase(null, null);
             }
+
+            // create a new, temp, database (will be disposed with UsingDatabase)
+            return new UsingDatabase(null, factory.CreateDatabase());
         }
 
         /// <summary>
@@ -788,30 +796,26 @@ namespace Umbraco.Core
             return true;
         }
 
-        private class UsedDatabase : IDisposable
+        private class UsingDatabase : IDisposable
         {
-            private readonly UmbracoDatabase _database;
-            private readonly ILogger _logger;
+            private readonly UmbracoDatabase _orig;
+            private readonly UmbracoDatabase _temp;
 
-            public UsedDatabase(UmbracoDatabase database, ILogger logger)
+            public UsingDatabase(UmbracoDatabase orig, UmbracoDatabase temp)
             {
-                _logger = logger;
-
-                // replace with ours
-                _database = DefaultDatabaseFactory.DetachDatabase();
-                _logger.Debug<DatabaseContext>("Detached db " + (_database == null ? "x" : _database.InstanceSid) + ".");
-                DefaultDatabaseFactory.AttachDatabase(database);
-                _logger.Debug<DatabaseContext>("Attached db " + database.InstanceSid + ".");
+                _orig = orig;
+                _temp = temp;
             }
 
             public void Dispose()
             {
-                // restore the original DB
-                var db = DefaultDatabaseFactory.DetachDatabase();
-                _logger.Debug<DatabaseContext>("Detached db " + db.InstanceSid + ".");
-                db.Dispose();
-                DefaultDatabaseFactory.AttachDatabase(_database);
-                _logger.Debug<DatabaseContext>("Attached db " + (_database == null ? "x" : _database.InstanceSid) + ".");
+                if (_temp != null)
+                {
+                    _temp.Dispose();
+                    if (_orig != null)
+                        DefaultDatabaseFactory.AttachAmbientDatabase(_orig);
+                }
+                GC.SuppressFinalize(this);
             }
         }
     }
diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index 5139da20d8..2ffee29490 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Runtime.Remoting.Messaging;
 using System.Web;
 using Umbraco.Core.Logging;
@@ -250,12 +251,23 @@ namespace Umbraco.Core.Persistence
 
         static DefaultDatabaseFactory()
         {
-            SafeCallContext.Register(DetachDatabase, AttachDatabase);
+            SafeCallContext.Register(DetachAmbientDatabase, AttachAmbientDatabase);
         }
 
+        // gets a value indicating whether there is an ambient database
+	    internal static bool HasAmbientDatabase
+	    {
+	        get
+	        {
+	            return HttpContext.Current == null
+	                ? NonContextValue != null
+	                : HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] != null;
+	        }
+	    }
+
         // detaches the current database
         // ie returns the database and remove it from whatever is "context"
-        internal static UmbracoDatabase DetachDatabase()
+        internal static UmbracoDatabase DetachAmbientDatabase()
         {
             UmbracoDatabase database;
 
@@ -277,7 +289,7 @@ namespace Umbraco.Core.Persistence
         // attach a current database
         // ie assign it to whatever is "context"
         // throws if there already is a database
-        internal static void AttachDatabase(object o)
+        internal static void AttachAmbientDatabase(object o)
         {
             var database = o as UmbracoDatabase;
             if (o != null && database == null) throw new ArgumentException("Not an UmbracoDatabase.", "o");
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 6da7f4519b..24d889a06f 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;DEBUG_DATABASES</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index da49404b4d..7737101961 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -78,7 +78,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // running on a background task, requires a safe database (see UsingSafeDatabase doc)
-            using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
+            using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
             using (DisposableTimer.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
             {
                 Log.CleanLogs(GetLogScrubbingMaximumAge(_settings));
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index dc6c27959d..ba4fdddba5 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -83,10 +83,8 @@ namespace Umbraco.Web.Scheduling
                         };
 
                         // running on a background task, requires a safe database (see UsingSafeDatabase doc)
-                        //
-                        // this is because GetAuthenticationHeaderValue uses UserService to load the current user, hence requires a database
-                        //
-                        using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
+                        // (GetAuthenticationHeaderValue uses UserService to load the current user, hence requires a database)
+                        using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
                         {
                             //pass custom the authorization header
                             request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
diff --git a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
index 84b3e220ff..15ab8f244b 100644
--- a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
+++ b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
@@ -138,7 +138,7 @@ namespace Umbraco.Web.Strategies
                 try
                 {
                     // running on a background task, requires a safe database (see UsingSafeDatabase doc)
-                    using (ApplicationContext.Current.DatabaseContext.UsingSafeDatabase)
+                    using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
                     {
                         _svc.TouchServer(_serverAddress, _svc.CurrentServerIdentity, _registrar.Options.StaleServerTimeout);
                     }
diff --git a/src/UmbracoExamine/DataServices/UmbracoContentService.cs b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
index 4d2ea5bd9a..df0562f49c 100644
--- a/src/UmbracoExamine/DataServices/UmbracoContentService.cs
+++ b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
@@ -13,7 +13,6 @@ namespace UmbracoExamine.DataServices
 {
     public class UmbracoContentService : IContentService
     {
-
         private readonly ApplicationContext _applicationContext;
 
 		public UmbracoContentService()
@@ -58,7 +57,7 @@ namespace UmbracoExamine.DataServices
         [Obsolete("This should no longer be used, latest content will be indexed by using the IContentService directly")]
 		public XDocument GetLatestContentByXPath(string xpath)
         {
-            using (_applicationContext.DatabaseContext.UsingSafeDatabase)
+            using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
             {
                 var xmlContent = XDocument.Parse("<content></content>");
                 var rootContent = _applicationContext.Services.ContentService.GetRootContent();
@@ -80,7 +79,7 @@ namespace UmbracoExamine.DataServices
         /// <returns></returns>
         public bool IsProtected(int nodeId, string path)
         {
-            using (_applicationContext.DatabaseContext.UsingSafeDatabase)
+            using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
             {
                 return _applicationContext.Services.PublicAccessService.IsProtected(path.EnsureEndsWith("," + nodeId));
             }
@@ -93,8 +92,8 @@ namespace UmbracoExamine.DataServices
 		
 		public IEnumerable<string> GetAllUserPropertyNames()
 	    {
-	        using (_applicationContext.DatabaseContext.UsingSafeDatabase)
-	        {
+	        using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
+            {
 	            try
 	            {
 	                var result = _applicationContext.DatabaseContext.Database.Fetch<string>("select distinct alias from cmsPropertyType order by alias");

From ed37b84b3b3825a88b4d3c65eafc0342cea71751 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 24 Nov 2016 11:20:01 +0100
Subject: [PATCH 21/52] makes public the WeightedPluginAttribute, uses this for
 resolving the startup handlers so they could be sorted, adds special event to
 allow modifying the startup handlers.

---
 .../ApplicationEventsEventArgs.cs             | 15 +++++++
 .../ApplicationEventsResolver.cs              | 45 +++++++++++++++----
 .../WeightedPluginAttribute.cs                |  2 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |  1 +
 4 files changed, 53 insertions(+), 10 deletions(-)
 create mode 100644 src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs
new file mode 100644
index 0000000000..a459fc7268
--- /dev/null
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+
+namespace Umbraco.Core.ObjectResolution
+{
+    public class ApplicationEventsEventArgs : EventArgs
+    {
+        public List<IApplicationEventHandler> Handlers { get; private set; }
+
+        public ApplicationEventsEventArgs(List<IApplicationEventHandler> handlers)
+        {
+            Handlers = handlers;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 78c8f483f2..be94d7a3b9 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -13,7 +13,7 @@ namespace Umbraco.Core.ObjectResolution
 	/// <remarks>
 	/// This is disposable because after the app has started it should be disposed to release any memory being occupied by instances.
 	/// </remarks>
-    internal  sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
+    public sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
 	{
 
 	    private readonly LegacyStartupHandlerResolver _legacyResolver;
@@ -30,7 +30,7 @@ namespace Umbraco.Core.ObjectResolution
             //create the legacy resolver and only include the legacy types
 	        _legacyResolver = new LegacyStartupHandlerResolver(
                 serviceProvider, logger,
-	            applicationEventHandlers.Where(x => !TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x)));
+	            applicationEventHandlers.Where(x => TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x) == false));
 		}
 
         /// <summary>
@@ -42,14 +42,34 @@ namespace Umbraco.Core.ObjectResolution
             get { return base.InstanceTypes.Where(TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>); }
         }
 
-	    /// <summary>
-		/// Gets the <see cref="IApplicationEventHandler"/> implementations.
-		/// </summary>
-		public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
+	    private List<IApplicationEventHandler> _orderedAndFiltered;
+
+        /// <summary>
+        /// Gets the <see cref="IApplicationEventHandler"/> implementations.
+        /// </summary>
+        public IEnumerable<IApplicationEventHandler> ApplicationEventHandlers
 		{
-            get { return Values; }
+	        get
+	        {
+	            if (_orderedAndFiltered == null)
+	            {
+                    _orderedAndFiltered = GetSortedValues().ToList();
+
+                    //raise event so the collection can be modified
+                    OnCollectionResolved(new ApplicationEventsEventArgs(_orderedAndFiltered));
+                }
+	            return _orderedAndFiltered;
+	        }
 		}
 
+	    public event EventHandler<ApplicationEventsEventArgs> CollectionResolved;
+
+        private void OnCollectionResolved(ApplicationEventsEventArgs e)
+        {
+            var handler = CollectionResolved;
+            if (handler != null) handler(this, e);
+        }
+        
         /// <summary>
         /// Create instances of all of the legacy startup handlers
         /// </summary>
@@ -146,7 +166,14 @@ namespace Umbraco.Core.ObjectResolution
 	    {
             _legacyResolver.Dispose();
             ResetCollections();
+            _orderedAndFiltered.Clear();
+	        _orderedAndFiltered = null;
+
+            //Clear event handlers
+	        CollectionResolved = null;
+
 	    }
-        
-	}
+
+	    
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs
index 323142bd4c..69c763ed50 100644
--- a/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs
+++ b/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs
@@ -6,7 +6,7 @@ namespace Umbraco.Core.ObjectResolution
 	/// Indicates the relative weight of a resolved object type.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-	internal class WeightedPluginAttribute : Attribute
+	public class WeightedPluginAttribute : Attribute
 	{
 		/// <summary>
 		/// Initializes a new instance of the <see cref="WeightedPluginAttribute"/> class with a weight.
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 7a4c4f2363..3c58503b57 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -415,6 +415,7 @@
     <Compile Include="Models\UmbracoDomain.cs" />
     <Compile Include="Models\DoNotCloneAttribute.cs" />
     <Compile Include="Models\IDomain.cs" />
+    <Compile Include="ObjectResolution\ApplicationEventsEventArgs.cs" />
     <Compile Include="Persistence\BulkDataReader.cs" />
     <Compile Include="Persistence\DatabaseNodeLockExtensions.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />

From 0179540023cee8671c094f52142751db3f367c93 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 24 Nov 2016 18:13:05 +0100
Subject: [PATCH 22/52] Rename WeightAttribute, change default to 100, cleanup

---
 .../ApplicationEventsResolver.cs              | 14 ++++-------
 .../LazyManyObjectsResolverbase.cs            |  2 +-
 .../ManyObjectsResolverBase.cs                |  8 +++---
 .../WeightedPluginAttribute.cs                | 25 -------------------
 src/Umbraco.Core/Umbraco.Core.csproj          |  2 +-
 .../Resolvers/ManyResolverTests.cs            |  2 +-
 .../FileExtensionIconThumbnailProvider.cs     |  2 +-
 .../ImageThumbnailProvider.cs                 |  2 +-
 .../MediaTypeIconThumbnailProvider.cs         |  2 +-
 9 files changed, 15 insertions(+), 44 deletions(-)
 delete mode 100644 src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index be94d7a3b9..6933279258 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -15,7 +15,6 @@ namespace Umbraco.Core.ObjectResolution
 	/// </remarks>
     public sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
 	{
-
 	    private readonly LegacyStartupHandlerResolver _legacyResolver;
 
 	    /// <summary>
@@ -23,7 +22,7 @@ namespace Umbraco.Core.ObjectResolution
 	    /// </summary>
 	    /// <param name="logger"></param>
 	    /// <param name="applicationEventHandlers"></param>
-	    /// <param name="serviceProvider"></param>		
+	    /// <param name="serviceProvider"></param>
 	    internal ApplicationEventsResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Type> applicationEventHandlers)
             : base(serviceProvider, logger, applicationEventHandlers)
 		{
@@ -34,7 +33,7 @@ namespace Umbraco.Core.ObjectResolution
 		}
 
         /// <summary>
-        /// Override in order to only return types of IApplicationEventHandler and above, 
+        /// Override in order to only return types of IApplicationEventHandler and above,
         /// do not include the legacy types of IApplicationStartupHandler
         /// </summary>
         protected override IEnumerable<Type> InstanceTypes
@@ -69,7 +68,7 @@ namespace Umbraco.Core.ObjectResolution
             var handler = CollectionResolved;
             if (handler != null) handler(this, e);
         }
-        
+
         /// <summary>
         /// Create instances of all of the legacy startup handlers
         /// </summary>
@@ -82,11 +81,11 @@ namespace Umbraco.Core.ObjectResolution
 		protected override bool SupportsClear
 		{
             get { return false; }
-		}		
+		}
 
 		protected override bool SupportsInsert
 		{
-			get { return false; }			
+			get { return false; }
 		}
 
 	    private class LegacyStartupHandlerResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationStartupHandler>, IDisposable
@@ -171,9 +170,6 @@ namespace Umbraco.Core.ObjectResolution
 
             //Clear event handlers
 	        CollectionResolved = null;
-
 	    }
-
-	    
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/LazyManyObjectsResolverbase.cs b/src/Umbraco.Core/ObjectResolution/LazyManyObjectsResolverbase.cs
index 2851a70e15..821b93ba03 100644
--- a/src/Umbraco.Core/ObjectResolution/LazyManyObjectsResolverbase.cs
+++ b/src/Umbraco.Core/ObjectResolution/LazyManyObjectsResolverbase.cs
@@ -17,7 +17,7 @@ namespace Umbraco.Core.ObjectResolution
     /// for when there is some processing overhead (i.e. Type finding in assemblies) to return the Types used to instantiate the instances. 
     /// In some these cases we don't want to have to type-find during application startup, only when we need to resolve the instances.</para>
     /// <para>Important notes about this resolver: it does not support Insert or Remove and therefore does not support any ordering unless 
-    /// the types are marked with the WeightedPluginAttribute.</para>
+    /// the types are marked with the WeightAttribute.</para>
     /// </remarks>
     public abstract class LazyManyObjectsResolverBase<TResolver, TResolved> : ManyObjectsResolverBase<TResolver, TResolved>
         where TResolved : class
diff --git a/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
index 1cfa81228a..3519bf86bc 100644
--- a/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
@@ -23,7 +23,7 @@ namespace Umbraco.Core.ObjectResolution
 		private readonly List<Type> _instanceTypes = new List<Type>();
 	    private IEnumerable<TResolved> _sortedValues;
 
-		private int _defaultPluginWeight = 10;
+		private int _defaultPluginWeight = 100;
 
 		#region Constructors
 
@@ -179,7 +179,7 @@ namespace Umbraco.Core.ObjectResolution
 		/// </summary>
 		/// <returns>The sorted resolved object instances.</returns>
 		/// <remarks>
-		/// <para>The order is based upon the <c>WeightedPluginAttribute</c> and <c>DefaultPluginWeight</c>.</para>
+		/// <para>The order is based upon the <c>WeightAttribute</c> and <c>DefaultPluginWeight</c>.</para>
 		/// <para>Weights are sorted ascendingly (lowest weights come first).</para>
 		/// </remarks>
 		protected IEnumerable<TResolved> GetSortedValues()
@@ -196,7 +196,7 @@ namespace Umbraco.Core.ObjectResolution
 		/// <summary>
 		/// Gets or sets the default type weight.
 		/// </summary>
-		/// <remarks>Determines the weight of types that do not have a <c>WeightedPluginAttribute</c> set on 
+		/// <remarks>Determines the weight of types that do not have a <c>WeightAttribute</c> set on 
 		/// them, when calling <c>GetSortedValues</c>.</remarks>
 		protected virtual int DefaultPluginWeight
 		{
@@ -212,7 +212,7 @@ namespace Umbraco.Core.ObjectResolution
 		protected virtual int GetObjectWeight(object o)
 		{
 			var type = o.GetType();
-			var attr = type.GetCustomAttribute<WeightedPluginAttribute>(true);
+			var attr = type.GetCustomAttribute<WeightAttribute>(true);
 			return attr == null ? DefaultPluginWeight : attr.Weight;
 		}
 
diff --git a/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs
deleted file mode 100644
index 69c763ed50..0000000000
--- a/src/Umbraco.Core/ObjectResolution/WeightedPluginAttribute.cs
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;
-
-namespace Umbraco.Core.ObjectResolution
-{
-	/// <summary>
-	/// Indicates the relative weight of a resolved object type.
-	/// </summary>
-	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false)]
-	public class WeightedPluginAttribute : Attribute
-	{
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WeightedPluginAttribute"/> class with a weight.
-		/// </summary>
-		/// <param name="weight">The object type weight.</param>
-		public WeightedPluginAttribute(int weight)
-		{
-			Weight = weight;
-		}
-
-		/// <summary>
-		/// Gets or sets the weight of the object type.
-		/// </summary>
-		public int Weight { get; private set; }
-	}
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 3c58503b57..dbd5199009 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -1204,7 +1204,7 @@
     <Compile Include="Models\Rdbms\UserDto.cs" />
     <Compile Include="Models\Rdbms\UserTypeDto.cs" />
     <Compile Include="NameValueCollectionExtensions.cs" />
-    <Compile Include="ObjectResolution\WeightedPluginAttribute.cs" />
+    <Compile Include="ObjectResolution\WeightAttribute.cs" />
     <Compile Include="Persistence\PetaPoco.cs" />
     <Compile Include="PropertyEditors\ValueConverters\DatePickerValueConverter.cs" />
     <Compile Include="PropertyEditors\IPropertyEditorValueConverter.cs" />
diff --git a/src/Umbraco.Tests/Resolvers/ManyResolverTests.cs b/src/Umbraco.Tests/Resolvers/ManyResolverTests.cs
index 4cf1c3b56f..3ec470de4b 100644
--- a/src/Umbraco.Tests/Resolvers/ManyResolverTests.cs
+++ b/src/Umbraco.Tests/Resolvers/ManyResolverTests.cs
@@ -36,7 +36,7 @@ namespace Umbraco.Tests.Resolvers
         public class Resolved1 : Resolved
         { }
 
-        [WeightedPlugin(5)] // default is 10
+        [Weight(5)] // default is 100
         public class Resolved2 : Resolved
         { }
 
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
index 4d6489cb2c..8699592467 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/FileExtensionIconThumbnailProvider.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
-	[WeightedPlugin(2000)]
+	[Weight(2000)]
     public class FileExtensionIconThumbnailProvider : AbstractThumbnailProvider
     {
         protected override IEnumerable<string> SupportedExtensions
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
index 6f9b26c79d..56fe6306e3 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/ImageThumbnailProvider.cs
@@ -10,7 +10,7 @@ using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
-	[WeightedPlugin(1000)]
+	[Weight(1000)]
     public class ImageThumbnailProvider : AbstractThumbnailProvider
     {        
         protected override IEnumerable<string> SupportedExtensions
diff --git a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
index be1e6b4b42..6112d60471 100644
--- a/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
+++ b/src/Umbraco.Web/Media/ThumbnailProviders/MediaTypeIconThumbnailProvider.cs
@@ -8,7 +8,7 @@ using Umbraco.Core.IO;
 
 namespace Umbraco.Web.Media.ThumbnailProviders
 {
-	[WeightedPlugin(3000)]
+	[Weight(3000)]
     public class MediaTypeIconThumbnailProvider : AbstractThumbnailProvider
     {
         

From 672568d1f57a893785f9d13e6992217221e0dba0 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 24 Nov 2016 18:16:14 +0100
Subject: [PATCH 23/52] Add missing file

---
 .../ObjectResolution/WeightAttribute.cs       | 25 +++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 src/Umbraco.Core/ObjectResolution/WeightAttribute.cs

diff --git a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
new file mode 100644
index 0000000000..f360443c55
--- /dev/null
+++ b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
@@ -0,0 +1,25 @@
+using System;
+
+namespace Umbraco.Core.ObjectResolution
+{
+	/// <summary>
+	/// Indicates the relative weight of a resolved object type.
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
+	public class WeightAttribute : Attribute
+	{
+		/// <summary>
+		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
+		/// </summary>
+		/// <param name="weight">The object type weight.</param>
+		public WeightAttribute(int weight)
+		{
+			Weight = weight;
+		}
+
+		/// <summary>
+		/// Gets or sets the weight of the object type.
+		/// </summary>
+		public int Weight { get; private set; }
+	}
+}
\ No newline at end of file

From 81750c41bd50197fb8556af34212ae3f9cd4ffa1 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 10:35:36 +0100
Subject: [PATCH 24/52] Removes events for filtering and instead use a special
 interface to perform the filtering, updates ctor for WeightAttribute to only
 accept positive numbers for public, internally it could be negative numbers,
 updates the filtering to always ensure that core handlers are at the
 beginning

---
 .../ApplicationEventsEventArgs.cs             |  15 -
 .../ApplicationEventsResolver.cs              |  53 +-
 .../IApplicationEventsFilter.cs               |  12 +
 .../ManyObjectsResolverBase.cs                | 631 +++++++++---------
 .../ObjectResolution/WeightAttribute.cs       |  19 +-
 src/Umbraco.Core/Umbraco.Core.csproj          |   2 +-
 6 files changed, 384 insertions(+), 348 deletions(-)
 delete mode 100644 src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs
 create mode 100644 src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs
deleted file mode 100644
index a459fc7268..0000000000
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsEventArgs.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace Umbraco.Core.ObjectResolution
-{
-    public class ApplicationEventsEventArgs : EventArgs
-    {
-        public List<IApplicationEventHandler> Handlers { get; private set; }
-
-        public ApplicationEventsEventArgs(List<IApplicationEventHandler> handlers)
-        {
-            Handlers = handlers;
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 6933279258..53e8049ee9 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -7,7 +7,7 @@ using umbraco.interfaces;
 
 namespace Umbraco.Core.ObjectResolution
 {
-	/// <summary>
+    /// <summary>
 	/// A resolver to return all IApplicationEvents objects
 	/// </summary>
 	/// <remarks>
@@ -52,21 +52,47 @@ namespace Umbraco.Core.ObjectResolution
 	        {
 	            if (_orderedAndFiltered == null)
 	            {
-                    _orderedAndFiltered = GetSortedValues().ToList();
-
-                    //raise event so the collection can be modified
-                    OnCollectionResolved(new ApplicationEventsEventArgs(_orderedAndFiltered));
+                    _orderedAndFiltered = GetSortedValues().ToList();                    
+                    OnCollectionResolved(_orderedAndFiltered);
                 }
 	            return _orderedAndFiltered;
 	        }
 		}
-
-	    public event EventHandler<ApplicationEventsEventArgs> CollectionResolved;
-
-        private void OnCollectionResolved(ApplicationEventsEventArgs e)
+        
+        /// <summary>
+        /// Allow any filters to be applied to the event handler list
+        /// </summary>
+        /// <param name="handlers"></param>
+        /// <remarks>
+        /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing,
+        /// however this also ensures that any core handlers are executed first to ensure the stabiliy of Umbraco.
+        /// </remarks>
+        private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
         {
-            var handler = CollectionResolved;
-            if (handler != null) handler(this, e);
+            foreach (var filter in handlers.OfType<IApplicationEventsFilter>().ToArray())
+            {
+                filter.Filter(handlers);
+            }
+
+            //find all of the core handlers and their weight, remove them from the main list
+            var coreItems = new List<Tuple<IApplicationEventHandler, int>>();
+            foreach (var handler in handlers.ToArray())
+            {
+                //Yuck, but not sure what else we can do 
+                if (
+                    handler.GetType().Assembly.FullName.StartsWith("Umbraco.", StringComparison.OrdinalIgnoreCase)
+                    || handler.GetType().Assembly.FullName.StartsWith("Concorde."))
+                {
+                    coreItems.Add(new Tuple<IApplicationEventHandler, int>(handler, GetObjectWeight(handler)));
+                    handlers.Remove(handler);
+                }
+            }
+
+            //re-add the core handlers to the beginning of the list ordered by their weight
+            foreach (var coreHandler in coreItems.OrderBy(x => x.Item2))
+            {
+                handlers.Insert(0, coreHandler.Item1);
+            }            
         }
 
         /// <summary>
@@ -166,10 +192,7 @@ namespace Umbraco.Core.ObjectResolution
             _legacyResolver.Dispose();
             ResetCollections();
             _orderedAndFiltered.Clear();
-	        _orderedAndFiltered = null;
-
-            //Clear event handlers
-	        CollectionResolved = null;
+	        _orderedAndFiltered = null;            
 	    }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs b/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs
new file mode 100644
index 0000000000..e295e791d8
--- /dev/null
+++ b/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+
+namespace Umbraco.Core.ObjectResolution
+{
+    /// <summary>
+    /// This can be used to filter or re-order application events before they are executed
+    /// </summary>
+    public interface IApplicationEventsFilter
+    {
+        void Filter(List<IApplicationEventHandler> eventHandlers);
+    }
+}
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
index 3519bf86bc..5e170f47f4 100644
--- a/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
+++ b/src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
@@ -14,18 +14,18 @@ namespace Umbraco.Core.ObjectResolution
 	/// <typeparam name="TResolver">The type of the concrete resolver class.</typeparam>
 	/// <typeparam name="TResolved">The type of the resolved objects.</typeparam>
 	public abstract class ManyObjectsResolverBase<TResolver, TResolved> : ResolverBase<TResolver>
-		where TResolved : class
+        where TResolved : class
         where TResolver : ResolverBase
-	{
-		private Lazy<IEnumerable<TResolved>> _applicationInstances;
-		private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
-		private readonly string _httpContextKey;
-		private readonly List<Type> _instanceTypes = new List<Type>();
-	    private IEnumerable<TResolved> _sortedValues;
+    {
+        private Lazy<IEnumerable<TResolved>> _applicationInstances;
+        private readonly ReaderWriterLockSlim _lock = new ReaderWriterLockSlim();
+        private readonly string _httpContextKey;
+        private readonly List<Type> _instanceTypes = new List<Type>();
+        private IEnumerable<TResolved> _sortedValues;
 
-		private int _defaultPluginWeight = 100;
+        private int _defaultPluginWeight = 100;
 
-		#region Constructors
+        #region Constructors
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManyObjectsResolverBase{TResolver, TResolved}"/> class with an empty list of objects,
@@ -61,11 +61,11 @@ namespace Umbraco.Core.ObjectResolution
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("Use ctor specifying IServiceProvider instead")]
-		protected ManyObjectsResolverBase(ObjectLifetimeScope scope = ObjectLifetimeScope.Application)
+        protected ManyObjectsResolverBase(ObjectLifetimeScope scope = ObjectLifetimeScope.Application)
             : this(new ActivatorServiceProvider(), LoggerResolver.Current.Logger, scope)
-		{
-			
-		}
+        {
+
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ManyObjectsResolverBase{TResolver, TResolved}"/> class with an empty list of objects,
@@ -76,19 +76,19 @@ namespace Umbraco.Core.ObjectResolution
         /// <param name="httpContext">The HttpContextBase corresponding to the HttpRequest.</param>
         /// <exception cref="ArgumentNullException"><paramref name="httpContext"/> is <c>null</c>.</exception>
         protected ManyObjectsResolverBase(IServiceProvider serviceProvider, ILogger logger, HttpContextBase httpContext)
-		{
+        {
             if (serviceProvider == null) throw new ArgumentNullException("serviceProvider");
             if (httpContext == null) throw new ArgumentNullException("httpContext");
             CanResolveBeforeFrozen = false;
             Logger = logger;
-			LifetimeScope = ObjectLifetimeScope.HttpRequest;
-			_httpContextKey = GetType().FullName;
+            LifetimeScope = ObjectLifetimeScope.HttpRequest;
+            _httpContextKey = GetType().FullName;
             ServiceProvider = serviceProvider;
             CurrentHttpContext = httpContext;
-			_instanceTypes = new List<Type>();
+            _instanceTypes = new List<Type>();
 
             InitializeAppInstances();
-		}
+        }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("Use ctor specifying IServiceProvider instead")]
@@ -110,57 +110,57 @@ namespace Umbraco.Core.ObjectResolution
         /// <exception cref="InvalidOperationException"><paramref name="scope"/> is per HttpRequest but the current HttpContext is null.</exception>
         protected ManyObjectsResolverBase(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Type> value, ObjectLifetimeScope scope = ObjectLifetimeScope.Application)
             : this(serviceProvider, logger, scope)
-		{
-			_instanceTypes = value.ToList();
-		}
+        {
+            _instanceTypes = value.ToList();
+        }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
         [Obsolete("Use ctor specifying IServiceProvider instead")]
         protected ManyObjectsResolverBase(IEnumerable<Type> value, ObjectLifetimeScope scope = ObjectLifetimeScope.Application)
             : this(new ActivatorServiceProvider(), LoggerResolver.Current.Logger, value, scope)
         {
-            
+
         }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="ManyObjectsResolverBase{TResolver, TResolved}"/> class with an initial list of objects,
-		/// with creation of objects based on an HttpRequest lifetime scope.
-		/// </summary>
-		/// <param name="httpContext">The HttpContextBase corresponding to the HttpRequest.</param>
-		/// <param name="value">The list of object types.</param>
-		/// <exception cref="ArgumentNullException"><paramref name="httpContext"/> is <c>null</c>.</exception>
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ManyObjectsResolverBase{TResolver, TResolved}"/> class with an initial list of objects,
+        /// with creation of objects based on an HttpRequest lifetime scope.
+        /// </summary>
+        /// <param name="httpContext">The HttpContextBase corresponding to the HttpRequest.</param>
+        /// <param name="value">The list of object types.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="httpContext"/> is <c>null</c>.</exception>
         [Obsolete("Use ctor specifying IServiceProvider instead")]
         protected ManyObjectsResolverBase(HttpContextBase httpContext, IEnumerable<Type> value)
             : this(new ActivatorServiceProvider(), LoggerResolver.Current.Logger, httpContext)
-		{
-			_instanceTypes = value.ToList();
-		} 
-		#endregion
+        {
+            _instanceTypes = value.ToList();
+        }
+        #endregion
 
         private void InitializeAppInstances()
         {
             _applicationInstances = new Lazy<IEnumerable<TResolved>>(() => CreateInstances().ToArray());
         }
 
-		/// <summary>
-		/// Gets or sets a value indicating whether the resolver can resolve objects before resolution is frozen.
-		/// </summary>
-		/// <remarks>This is false by default and is used for some special internal resolvers.</remarks>
-		internal bool CanResolveBeforeFrozen { get; set; }
+        /// <summary>
+        /// Gets or sets a value indicating whether the resolver can resolve objects before resolution is frozen.
+        /// </summary>
+        /// <remarks>This is false by default and is used for some special internal resolvers.</remarks>
+        internal bool CanResolveBeforeFrozen { get; set; }
 
-		/// <summary>
-		/// Gets the list of types to create instances from.
-		/// </summary>
-		protected virtual IEnumerable<Type> InstanceTypes
-		{
-			get { return _instanceTypes; }
-		}
+        /// <summary>
+        /// Gets the list of types to create instances from.
+        /// </summary>
+        protected virtual IEnumerable<Type> InstanceTypes
+        {
+            get { return _instanceTypes; }
+        }
 
-		/// <summary>
-		/// Gets or sets the <see cref="HttpContextBase"/> used to initialize this object, if any.
-		/// </summary>
-		/// <remarks>If not null, then <c>LifetimeScope</c> will be <c>ObjectLifetimeScope.HttpRequest</c>.</remarks>
-		protected HttpContextBase CurrentHttpContext { get; private set; }
+        /// <summary>
+        /// Gets or sets the <see cref="HttpContextBase"/> used to initialize this object, if any.
+        /// </summary>
+        /// <remarks>If not null, then <c>LifetimeScope</c> will be <c>ObjectLifetimeScope.HttpRequest</c>.</remarks>
+        protected HttpContextBase CurrentHttpContext { get; private set; }
 
         /// <summary>
         /// Returns the service provider used to instantiate objects
@@ -174,16 +174,16 @@ namespace Umbraco.Core.ObjectResolution
 		/// </summary>
 		protected ObjectLifetimeScope LifetimeScope { get; private set; }
 
-		/// <summary>
-		/// Gets the resolved object instances, sorted by weight.
-		/// </summary>
-		/// <returns>The sorted resolved object instances.</returns>
-		/// <remarks>
-		/// <para>The order is based upon the <c>WeightAttribute</c> and <c>DefaultPluginWeight</c>.</para>
-		/// <para>Weights are sorted ascendingly (lowest weights come first).</para>
-		/// </remarks>
-		protected IEnumerable<TResolved> GetSortedValues()
-		{
+        /// <summary>
+        /// Gets the resolved object instances, sorted by weight.
+        /// </summary>
+        /// <returns>The sorted resolved object instances.</returns>
+        /// <remarks>
+        /// <para>The order is based upon the <c>WeightAttribute</c> and <c>DefaultPluginWeight</c>.</para>
+        /// <para>Weights are sorted ascendingly (lowest weights come first).</para>
+        /// </remarks>
+        protected IEnumerable<TResolved> GetSortedValues()
+        {
             if (_sortedValues == null)
             {
                 var values = Values.ToList();
@@ -191,18 +191,18 @@ namespace Umbraco.Core.ObjectResolution
                 _sortedValues = values;
             }
             return _sortedValues;
-		}
+        }
 
-		/// <summary>
-		/// Gets or sets the default type weight.
-		/// </summary>
-		/// <remarks>Determines the weight of types that do not have a <c>WeightAttribute</c> set on 
-		/// them, when calling <c>GetSortedValues</c>.</remarks>
-		protected virtual int DefaultPluginWeight
-		{
-			get { return _defaultPluginWeight; }
-			set { _defaultPluginWeight = value; }
-		}
+        /// <summary>
+        /// Gets or sets the default type weight.
+        /// </summary>
+        /// <remarks>Determines the weight of types that do not have a <c>WeightAttribute</c> set on 
+        /// them, when calling <c>GetSortedValues</c>.</remarks>
+        protected virtual int DefaultPluginWeight
+        {
+            get { return _defaultPluginWeight; }
+            set { _defaultPluginWeight = value; }
+        }
 
         /// <summary>
         /// Returns the weight of an object for user with GetSortedValues
@@ -210,22 +210,22 @@ namespace Umbraco.Core.ObjectResolution
         /// <param name="o"></param>
         /// <returns></returns>
 		protected virtual int GetObjectWeight(object o)
-		{
-			var type = o.GetType();
-			var attr = type.GetCustomAttribute<WeightAttribute>(true);
-			return attr == null ? DefaultPluginWeight : attr.Weight;
-		}
+        {
+            var type = o.GetType();
+            var attr = type.GetCustomAttribute<WeightAttribute>(true);
+            return attr == null ? DefaultPluginWeight : attr.Weight;
+        }
 
-		/// <summary>
-		/// Gets the resolved object instances.
-		/// </summary>
-		/// <exception cref="InvalidOperationException"><c>CanResolveBeforeFrozen</c> is false, and resolution is not frozen.</exception>
-		protected IEnumerable<TResolved> Values
-		{
-			get
-			{
-			    using (Resolution.Reader(CanResolveBeforeFrozen))
-			    {
+        /// <summary>
+        /// Gets the resolved object instances.
+        /// </summary>
+        /// <exception cref="InvalidOperationException"><c>CanResolveBeforeFrozen</c> is false, and resolution is not frozen.</exception>
+        protected IEnumerable<TResolved> Values
+        {
+            get
+            {
+                using (Resolution.Reader(CanResolveBeforeFrozen))
+                {
                     // note: we apply .ToArray() to the output of CreateInstance() because that is an IEnumerable that
                     // comes from the PluginManager we want to be _sure_ that it's not a Linq of some sort, but the
                     // instances have actually been instanciated when we return.
@@ -247,7 +247,7 @@ namespace Umbraco.Core.ObjectResolution
                                 CurrentHttpContext.Items[_httpContextKey] = instances;
                             }
                             return (TResolved[])CurrentHttpContext.Items[_httpContextKey];
-                            
+
                         case ObjectLifetimeScope.Application:
 
                             return _applicationInstances.Value;
@@ -258,132 +258,132 @@ namespace Umbraco.Core.ObjectResolution
                             return CreateInstances().ToArray();
                     }
                 }
-			}
-		}
+            }
+        }
 
-		/// <summary>
-		/// Creates the object instances for the types contained in the types collection.
-		/// </summary>
-		/// <returns>A list of objects of type <typeparamref name="TResolved"/>.</returns>
-		protected virtual IEnumerable<TResolved> CreateInstances()
-		{
-			return ServiceProvider.CreateInstances<TResolved>(InstanceTypes, Logger);
-		}
+        /// <summary>
+        /// Creates the object instances for the types contained in the types collection.
+        /// </summary>
+        /// <returns>A list of objects of type <typeparamref name="TResolved"/>.</returns>
+        protected virtual IEnumerable<TResolved> CreateInstances()
+        {
+            return ServiceProvider.CreateInstances<TResolved>(InstanceTypes, Logger);
+        }
 
-		#region Types collection manipulation
+        #region Types collection manipulation
 
-		/// <summary>
-		/// Removes a type.
-		/// </summary>
-		/// <param name="value">The type to remove.</param>
-		/// <exception cref="InvalidOperationException">the resolver does not support removing types, or 
-		/// the type is not a valid type for the resolver.</exception>
-		public virtual void RemoveType(Type value)
-		{
-			EnsureSupportsRemove();
+        /// <summary>
+        /// Removes a type.
+        /// </summary>
+        /// <param name="value">The type to remove.</param>
+        /// <exception cref="InvalidOperationException">the resolver does not support removing types, or 
+        /// the type is not a valid type for the resolver.</exception>
+        public virtual void RemoveType(Type value)
+        {
+            EnsureSupportsRemove();
 
-			using (Resolution.Configuration)
-			using (var l = new UpgradeableReadLock(_lock))
-			{
-				EnsureCorrectType(value);
+            using (Resolution.Configuration)
+            using (var l = new UpgradeableReadLock(_lock))
+            {
+                EnsureCorrectType(value);
 
-				l.UpgradeToWriteLock();
-				_instanceTypes.Remove(value);
-			}
-		}
+                l.UpgradeToWriteLock();
+                _instanceTypes.Remove(value);
+            }
+        }
 
-		/// <summary>
-		/// Removes a type.
-		/// </summary>
-		/// <typeparam name="T">The type to remove.</typeparam>
-		/// <exception cref="InvalidOperationException">the resolver does not support removing types, or 
-		/// the type is not a valid type for the resolver.</exception>
-		public void RemoveType<T>()
+        /// <summary>
+        /// Removes a type.
+        /// </summary>
+        /// <typeparam name="T">The type to remove.</typeparam>
+        /// <exception cref="InvalidOperationException">the resolver does not support removing types, or 
+        /// the type is not a valid type for the resolver.</exception>
+        public void RemoveType<T>()
             where T : TResolved
-		{
-			RemoveType(typeof(T));
-		}
+        {
+            RemoveType(typeof(T));
+        }
 
-		/// <summary>
-		/// Adds types.
-		/// </summary>
-		/// <param name="types">The types to add.</param>
-		/// <remarks>The types are appended at the end of the list.</remarks>
-		/// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
-		/// a type is not a valid type for the resolver, or a type is already in the collection of types.</exception>
-		protected void AddTypes(IEnumerable<Type> types)
-		{
-			EnsureSupportsAdd();
+        /// <summary>
+        /// Adds types.
+        /// </summary>
+        /// <param name="types">The types to add.</param>
+        /// <remarks>The types are appended at the end of the list.</remarks>
+        /// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
+        /// a type is not a valid type for the resolver, or a type is already in the collection of types.</exception>
+        protected void AddTypes(IEnumerable<Type> types)
+        {
+            EnsureSupportsAdd();
 
-			using (Resolution.Configuration)
-			using (new WriteLock(_lock))
-			{
-				foreach(var t in types)
-				{
-					EnsureCorrectType(t);
+            using (Resolution.Configuration)
+            using (new WriteLock(_lock))
+            {
+                foreach (var t in types)
+                {
+                    EnsureCorrectType(t);
                     if (_instanceTypes.Contains(t))
-					{
-						throw new InvalidOperationException(string.Format(
-							"Type {0} is already in the collection of types.", t.FullName));
-					}
-					_instanceTypes.Add(t);	
-				}				
-			}
-		}
+                    {
+                        throw new InvalidOperationException(string.Format(
+                            "Type {0} is already in the collection of types.", t.FullName));
+                    }
+                    _instanceTypes.Add(t);
+                }
+            }
+        }
 
-		/// <summary>
-		/// Adds a type.
-		/// </summary>
-		/// <param name="value">The type to add.</param>
-		/// <remarks>The type is appended at the end of the list.</remarks>
-		/// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
-		/// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
-		public virtual void AddType(Type value)
-		{
-			EnsureSupportsAdd();
+        /// <summary>
+        /// Adds a type.
+        /// </summary>
+        /// <param name="value">The type to add.</param>
+        /// <remarks>The type is appended at the end of the list.</remarks>
+        /// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
+        /// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
+        public virtual void AddType(Type value)
+        {
+            EnsureSupportsAdd();
 
-			using (Resolution.Configuration)
-			using (var l = new UpgradeableReadLock(_lock))
-			{
-				EnsureCorrectType(value);
+            using (Resolution.Configuration)
+            using (var l = new UpgradeableReadLock(_lock))
+            {
+                EnsureCorrectType(value);
                 if (_instanceTypes.Contains(value))
-				{
-					throw new InvalidOperationException(string.Format(
-						"Type {0} is already in the collection of types.", value.FullName));
-				}
+                {
+                    throw new InvalidOperationException(string.Format(
+                        "Type {0} is already in the collection of types.", value.FullName));
+                }
 
-				l.UpgradeToWriteLock();
-				_instanceTypes.Add(value);
-			}
-		}
+                l.UpgradeToWriteLock();
+                _instanceTypes.Add(value);
+            }
+        }
 
-		/// <summary>
-		/// Adds a type.
-		/// </summary>
-		/// <typeparam name="T">The type to add.</typeparam>
-		/// <remarks>The type is appended at the end of the list.</remarks>
-		/// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
-		/// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
-		public void AddType<T>()
+        /// <summary>
+        /// Adds a type.
+        /// </summary>
+        /// <typeparam name="T">The type to add.</typeparam>
+        /// <remarks>The type is appended at the end of the list.</remarks>
+        /// <exception cref="InvalidOperationException">the resolver does not support adding types, or 
+        /// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
+        public void AddType<T>()
             where T : TResolved
-		{
-			AddType(typeof(T));
-		}
+        {
+            AddType(typeof(T));
+        }
 
-		/// <summary>
-		/// Clears the list of types
-		/// </summary>
-		/// <exception cref="InvalidOperationException">the resolver does not support clearing types.</exception>
-		public virtual void Clear()
-		{
-			EnsureSupportsClear();
+        /// <summary>
+        /// Clears the list of types
+        /// </summary>
+        /// <exception cref="InvalidOperationException">the resolver does not support clearing types.</exception>
+        public virtual void Clear()
+        {
+            EnsureSupportsClear();
 
-			using (Resolution.Configuration)
-			using (new WriteLock(_lock))
-			{
-				_instanceTypes.Clear();
-			}
-		}
+            using (Resolution.Configuration)
+            using (new WriteLock(_lock))
+            {
+                _instanceTypes.Clear();
+            }
+        }
 
         /// <summary>
         /// WARNING! Do not use this unless you know what you are doing, clear all types registered and instances
@@ -399,32 +399,32 @@ namespace Umbraco.Core.ObjectResolution
             }
         }
 
-		/// <summary>
-		/// Inserts a type at the specified index.
-		/// </summary>
-		/// <param name="index">The zero-based index at which the type should be inserted.</param>
-		/// <param name="value">The type to insert.</param>
-		/// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
-		/// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
-		/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is out of range.</exception>
-		public virtual void InsertType(int index, Type value)
-		{			
-			EnsureSupportsInsert();
+        /// <summary>
+        /// Inserts a type at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index at which the type should be inserted.</param>
+        /// <param name="value">The type to insert.</param>
+        /// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
+        /// the type is not a valid type for the resolver, or the type is already in the collection of types.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is out of range.</exception>
+        public virtual void InsertType(int index, Type value)
+        {
+            EnsureSupportsInsert();
 
-			using (Resolution.Configuration)
-			using (var l = new UpgradeableReadLock(_lock))
-			{
-				EnsureCorrectType(value);
+            using (Resolution.Configuration)
+            using (var l = new UpgradeableReadLock(_lock))
+            {
+                EnsureCorrectType(value);
                 if (_instanceTypes.Contains(value))
-				{
-					throw new InvalidOperationException(string.Format(
-						"Type {0} is already in the collection of types.", value.FullName));
-				}
+                {
+                    throw new InvalidOperationException(string.Format(
+                        "Type {0} is already in the collection of types.", value.FullName));
+                }
 
-				l.UpgradeToWriteLock();
-				_instanceTypes.Insert(index, value);
-			}
-		}
+                l.UpgradeToWriteLock();
+                _instanceTypes.Insert(index, value);
+            }
+        }
 
         /// <summary>
         /// Inserts a type at the beginning of the list.
@@ -445,9 +445,9 @@ namespace Umbraco.Core.ObjectResolution
 		/// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is out of range.</exception>
 		public void InsertType<T>(int index)
             where T : TResolved
-		{
-			InsertType(index, typeof(T));
-		}
+        {
+            InsertType(index, typeof(T));
+        }
 
         /// <summary>
         /// Inserts a type at the beginning of the list.
@@ -458,68 +458,68 @@ namespace Umbraco.Core.ObjectResolution
         {
             InsertType(0, typeof(T));
         }
-        
-        /// <summary>
-		/// Inserts a type before a specified, already existing type.
-		/// </summary>
-		/// <param name="existingType">The existing type before which to insert.</param>
-		/// <param name="value">The type to insert.</param>
-		/// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
-		/// one of the types is not a valid type for the resolver, or the existing type is not in the collection,
-		/// or the new type is already in the collection of types.</exception>
-		public virtual void InsertTypeBefore(Type existingType, Type value)
-		{
-			EnsureSupportsInsert();
 
-			using (Resolution.Configuration)
-			using (var l = new UpgradeableReadLock(_lock))
-			{
-				EnsureCorrectType(existingType);
-				EnsureCorrectType(value);
+        /// <summary>
+        /// Inserts a type before a specified, already existing type.
+        /// </summary>
+        /// <param name="existingType">The existing type before which to insert.</param>
+        /// <param name="value">The type to insert.</param>
+        /// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
+        /// one of the types is not a valid type for the resolver, or the existing type is not in the collection,
+        /// or the new type is already in the collection of types.</exception>
+        public virtual void InsertTypeBefore(Type existingType, Type value)
+        {
+            EnsureSupportsInsert();
+
+            using (Resolution.Configuration)
+            using (var l = new UpgradeableReadLock(_lock))
+            {
+                EnsureCorrectType(existingType);
+                EnsureCorrectType(value);
                 if (_instanceTypes.Contains(existingType) == false)
-				{
-					throw new InvalidOperationException(string.Format(
-						"Type {0} is not in the collection of types.", existingType.FullName));
-				}
+                {
+                    throw new InvalidOperationException(string.Format(
+                        "Type {0} is not in the collection of types.", existingType.FullName));
+                }
                 if (_instanceTypes.Contains(value))
-				{
-					throw new InvalidOperationException(string.Format(
-						"Type {0} is already in the collection of types.", value.FullName));
-				}
+                {
+                    throw new InvalidOperationException(string.Format(
+                        "Type {0} is already in the collection of types.", value.FullName));
+                }
                 int index = _instanceTypes.IndexOf(existingType);
 
-				l.UpgradeToWriteLock();
-				_instanceTypes.Insert(index, value);
-			}
-		}
+                l.UpgradeToWriteLock();
+                _instanceTypes.Insert(index, value);
+            }
+        }
 
-		/// <summary>
-		/// Inserts a type before a specified, already existing type.
-		/// </summary>
-		/// <typeparam name="TExisting">The existing type before which to insert.</typeparam>
-		/// <typeparam name="T">The type to insert.</typeparam>
-		/// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
-		/// one of the types is not a valid type for the resolver, or the existing type is not in the collection,
-		/// or the new type is already in the collection of types.</exception>
-		public void InsertTypeBefore<TExisting, T>()
+        /// <summary>
+        /// Inserts a type before a specified, already existing type.
+        /// </summary>
+        /// <typeparam name="TExisting">The existing type before which to insert.</typeparam>
+        /// <typeparam name="T">The type to insert.</typeparam>
+        /// <exception cref="InvalidOperationException">the resolver does not support inserting types, or 
+        /// one of the types is not a valid type for the resolver, or the existing type is not in the collection,
+        /// or the new type is already in the collection of types.</exception>
+        public void InsertTypeBefore<TExisting, T>()
             where TExisting : TResolved
             where T : TResolved
-		{
-			InsertTypeBefore(typeof(TExisting), typeof(T));
-		}
+        {
+            InsertTypeBefore(typeof(TExisting), typeof(T));
+        }
 
-		/// <summary>
-		/// Returns a value indicating whether the specified type is already in the collection of types.
-		/// </summary>
-		/// <param name="value">The type to look for.</param>
-		/// <returns>A value indicating whether the type is already in the collection of types.</returns>
-		public virtual bool ContainsType(Type value)
-		{
-			using (new ReadLock(_lock))
-			{
-				return _instanceTypes.Contains(value);
-			}
-		}
+        /// <summary>
+        /// Returns a value indicating whether the specified type is already in the collection of types.
+        /// </summary>
+        /// <param name="value">The type to look for.</param>
+        /// <returns>A value indicating whether the type is already in the collection of types.</returns>
+        public virtual bool ContainsType(Type value)
+        {
+            using (new ReadLock(_lock))
+            {
+                return _instanceTypes.Contains(value);
+            }
+        }
 
         /// <summary>
         /// Gets the types in the collection of types.
@@ -536,27 +536,27 @@ namespace Umbraco.Core.ObjectResolution
             return types;
         }
 
-		/// <summary>
-		/// Returns a value indicating whether the specified type is already in the collection of types.
-		/// </summary>
-		/// <typeparam name="T">The type to look for.</typeparam>
-		/// <returns>A value indicating whether the type is already in the collection of types.</returns>
-		public bool ContainsType<T>()
+        /// <summary>
+        /// Returns a value indicating whether the specified type is already in the collection of types.
+        /// </summary>
+        /// <typeparam name="T">The type to look for.</typeparam>
+        /// <returns>A value indicating whether the type is already in the collection of types.</returns>
+        public bool ContainsType<T>()
             where T : TResolved
-		{
-			return ContainsType(typeof(T));
-		}
+        {
+            return ContainsType(typeof(T));
+        }
 
-		#endregion
+        #endregion
 
-		/// <summary>
-		/// Returns a WriteLock to use when modifying collections
-		/// </summary>
-		/// <returns></returns>
-		protected WriteLock GetWriteLock()
-		{
-			return new WriteLock(_lock);
-		}
+        /// <summary>
+        /// Returns a WriteLock to use when modifying collections
+        /// </summary>
+        /// <returns></returns>
+        protected WriteLock GetWriteLock()
+        {
+            return new WriteLock(_lock);
+        }
 
         #region Type utilities
 
@@ -581,70 +581,71 @@ namespace Umbraco.Core.ObjectResolution
         /// </summary>
         /// <exception cref="InvalidOperationException">The resolver does not support removing types.</exception>
         protected void EnsureSupportsRemove()
-		{
-			if (SupportsRemove == false)
+        {
+            if (SupportsRemove == false)
                 throw new InvalidOperationException("This resolver does not support removing types");
-		}
+        }
 
         /// <summary>
         /// Ensures that the resolver supports clearing types.
         /// </summary>
         /// <exception cref="InvalidOperationException">The resolver does not support clearing types.</exception>
-        protected void EnsureSupportsClear()		{
-			if (SupportsClear == false)
+        protected void EnsureSupportsClear()
+        {
+            if (SupportsClear == false)
                 throw new InvalidOperationException("This resolver does not support clearing types");
-		}
+        }
 
         /// <summary>
         /// Ensures that the resolver supports adding types.
         /// </summary>
         /// <exception cref="InvalidOperationException">The resolver does not support adding types.</exception>
         protected void EnsureSupportsAdd()
-		{
-			if (SupportsAdd == false)
+        {
+            if (SupportsAdd == false)
                 throw new InvalidOperationException("This resolver does not support adding new types");
-		}
+        }
 
         /// <summary>
         /// Ensures that the resolver supports inserting types.
         /// </summary>
         /// <exception cref="InvalidOperationException">The resolver does not support inserting types.</exception>
         protected void EnsureSupportsInsert()
-		{
-			if (SupportsInsert == false)
+        {
+            if (SupportsInsert == false)
                 throw new InvalidOperationException("This resolver does not support inserting new types");
-		}
+        }
 
         /// <summary>
         /// Gets a value indicating whether the resolver supports adding types.
         /// </summary>
 		protected virtual bool SupportsAdd
-		{
-			get { return true; }
-		}
+        {
+            get { return true; }
+        }
 
         /// <summary>
         /// Gets a value indicating whether the resolver supports inserting types.
         /// </summary>
         protected virtual bool SupportsInsert
-		{
-			get { return true; }
-		}
+        {
+            get { return true; }
+        }
 
         /// <summary>
         /// Gets a value indicating whether the resolver supports clearing types.
         /// </summary>
         protected virtual bool SupportsClear
-		{
-			get { return true; }
-		}
+        {
+            get { return true; }
+        }
 
         /// <summary>
         /// Gets a value indicating whether the resolver supports removing types.
         /// </summary>
         protected virtual bool SupportsRemove
-		{
-			get { return true; }
+        {
+            get { return true; }
         }
 
         #endregion
diff --git a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
index f360443c55..35f10a4111 100644
--- a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
+++ b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
@@ -8,13 +8,28 @@ namespace Umbraco.Core.ObjectResolution
 	[AttributeUsage(AttributeTargets.Class, AllowMultiple = false, Inherited = false)]
 	public class WeightAttribute : Attribute
 	{
+        /// <summary>
+		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
+		/// </summary>
+		/// <param name="weight">The object type weight.</param>
+		/// <remarks>
+		/// This internal constructor allows for internal Umbraco products to set a negative number weight
+		/// </remarks>
+	    internal WeightAttribute(int weight)
+	    {
+	        Weight = weight;
+	    }
+
 		/// <summary>
 		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
 		/// </summary>
 		/// <param name="weight">The object type weight.</param>
-		public WeightAttribute(int weight)
+		/// <remarks>
+		/// The weight must be a positive number
+		/// </remarks>
+		public WeightAttribute(uint weight)
 		{
-			Weight = weight;
+			Weight = Convert.ToInt32(weight);
 		}
 
 		/// <summary>
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index dbd5199009..2619a1c80c 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -415,7 +415,7 @@
     <Compile Include="Models\UmbracoDomain.cs" />
     <Compile Include="Models\DoNotCloneAttribute.cs" />
     <Compile Include="Models\IDomain.cs" />
-    <Compile Include="ObjectResolution\ApplicationEventsEventArgs.cs" />
+    <Compile Include="ObjectResolution\IApplicationEventsFilter.cs" />
     <Compile Include="Persistence\BulkDataReader.cs" />
     <Compile Include="Persistence\DatabaseNodeLockExtensions.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />

From a44a670f507ad29d6f38e55c0a1e23537306582c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 14:14:43 +0100
Subject: [PATCH 25/52] Removed the IApplicationEventsFilter interface, adds a
 delegate property that can be set instead

---
 .../ApplicationEventsResolver.cs                | 17 ++++++++++++-----
 .../IApplicationEventsFilter.cs                 | 12 ------------
 src/Umbraco.Core/Umbraco.Core.csproj            |  1 -
 3 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 53e8049ee9..dd22c2bc28 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -58,7 +58,15 @@ namespace Umbraco.Core.ObjectResolution
 	            return _orderedAndFiltered;
 	        }
 		}
-        
+
+        /// <summary>
+        /// A delegate that can be set in the pre-boot phase in order to filter or re-order the event handler collection
+        /// </summary>
+        /// <remarks>
+        /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
+        /// </remarks>
+        public Action<IList<IApplicationEventHandler>> FilterCollection { get; set; }
+
         /// <summary>
         /// Allow any filters to be applied to the event handler list
         /// </summary>
@@ -69,10 +77,9 @@ namespace Umbraco.Core.ObjectResolution
         /// </remarks>
         private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
         {
-            foreach (var filter in handlers.OfType<IApplicationEventsFilter>().ToArray())
-            {
-                filter.Filter(handlers);
-            }
+            if (FilterCollection == null) return;
+
+            FilterCollection(handlers);
 
             //find all of the core handlers and their weight, remove them from the main list
             var coreItems = new List<Tuple<IApplicationEventHandler, int>>();
diff --git a/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs b/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs
deleted file mode 100644
index e295e791d8..0000000000
--- a/src/Umbraco.Core/ObjectResolution/IApplicationEventsFilter.cs
+++ /dev/null
@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-
-namespace Umbraco.Core.ObjectResolution
-{
-    /// <summary>
-    /// This can be used to filter or re-order application events before they are executed
-    /// </summary>
-    public interface IApplicationEventsFilter
-    {
-        void Filter(List<IApplicationEventHandler> eventHandlers);
-    }
-}
\ No newline at end of file
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 2619a1c80c..e0eb63b265 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -415,7 +415,6 @@
     <Compile Include="Models\UmbracoDomain.cs" />
     <Compile Include="Models\DoNotCloneAttribute.cs" />
     <Compile Include="Models\IDomain.cs" />
-    <Compile Include="ObjectResolution\IApplicationEventsFilter.cs" />
     <Compile Include="Persistence\BulkDataReader.cs" />
     <Compile Include="Persistence\DatabaseNodeLockExtensions.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />

From 531fa9f25a26ddba4b583feea1ff3a5b866b202c Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 14:34:04 +0100
Subject: [PATCH 26/52] Ensures the delegate cannot be set once the event
 handlers are resolved.

---
 .../ApplicationEventsResolver.cs              | 47 ++++++++++++-------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index dd22c2bc28..880eac9591 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -52,6 +52,7 @@ namespace Umbraco.Core.ObjectResolution
 	        {
 	            if (_orderedAndFiltered == null)
 	            {
+	                _resolved = true;
                     _orderedAndFiltered = GetSortedValues().ToList();                    
                     OnCollectionResolved(_orderedAndFiltered);
                 }
@@ -59,23 +60,33 @@ namespace Umbraco.Core.ObjectResolution
 	        }
 		}
 
-        /// <summary>
-        /// A delegate that can be set in the pre-boot phase in order to filter or re-order the event handler collection
-        /// </summary>
-        /// <remarks>
-        /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
-        /// </remarks>
-        public Action<IList<IApplicationEventHandler>> FilterCollection { get; set; }
+	    /// <summary>
+	    /// A delegate that can be set in the pre-boot phase in order to filter or re-order the event handler collection
+	    /// </summary>
+	    /// <remarks>
+	    /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
+	    /// </remarks>
+	    public Action<IList<IApplicationEventHandler>> FilterCollection
+	    {
+	        get { return _filterCollection; }
+	        set
+	        {
+                if (_resolved)
+                    throw new InvalidOperationException("Cannot set the FilterCollection delegate once the ApplicationEventHandlers are resolved");
 
-        /// <summary>
-        /// Allow any filters to be applied to the event handler list
-        /// </summary>
-        /// <param name="handlers"></param>
-        /// <remarks>
-        /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing,
-        /// however this also ensures that any core handlers are executed first to ensure the stabiliy of Umbraco.
-        /// </remarks>
-        private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
+                _filterCollection = value;
+	        }
+	    }
+
+	    /// <summary>
+	    /// Allow any filters to be applied to the event handler list
+	    /// </summary>
+	    /// <param name="handlers"></param>
+	    /// <remarks>
+	    /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing,
+	    /// however this also ensures that any core handlers are executed first to ensure the stabiliy of Umbraco.
+	    /// </remarks>
+	    private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
         {
             if (FilterCollection == null) return;
 
@@ -142,8 +153,10 @@ namespace Umbraco.Core.ObjectResolution
 
 	    private bool _disposed;
 		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
+	    private Action<IList<IApplicationEventHandler>> _filterCollection;
+	    private bool _resolved = false;
 
-		/// <summary>
+	    /// <summary>
 		/// Gets a value indicating whether this instance is disposed.
 		/// </summary>
 		/// <value>

From 0e61d18b9e24a63d5fd1f7d881c05ef4526caefa Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 15:53:08 +0100
Subject: [PATCH 27/52] Ensure core  handlers are always first no matter what

---
 .../ObjectResolution/ApplicationEventsResolver.cs          | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 880eac9591..a90a870c30 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -88,9 +88,10 @@ namespace Umbraco.Core.ObjectResolution
 	    /// </remarks>
 	    private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
         {
-            if (FilterCollection == null) return;
-
-            FilterCollection(handlers);
+            if (FilterCollection != null)
+            {
+                FilterCollection(handlers);
+            }
 
             //find all of the core handlers and their weight, remove them from the main list
             var coreItems = new List<Tuple<IApplicationEventHandler, int>>();

From 14bf4bbd3253ae9380fe06ce08350e6db3b0f67b Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 15:55:33 +0100
Subject: [PATCH 28/52] throws exception if the delegate is already set

---
 src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index a90a870c30..6cb60e2df0 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -73,6 +73,8 @@ namespace Umbraco.Core.ObjectResolution
 	        {
                 if (_resolved)
                     throw new InvalidOperationException("Cannot set the FilterCollection delegate once the ApplicationEventHandlers are resolved");
+                if (_filterCollection != null)
+                    throw new InvalidOperationException("Cannot set the FilterCollection delegate once it's already been specified");
 
                 _filterCollection = value;
 	        }

From eeb94e1668433251fa6af2d47e2f14f2d076ec0f Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 18:07:27 +0100
Subject: [PATCH 29/52] U4-9222 The in memory XML cache is cloned everytime
 there is a content save even if there is nothing published

---
 src/Umbraco.Web/umbraco.presentation/content.cs | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 777fe80782..26076f8727 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -329,6 +329,17 @@ namespace umbraco
             if (c.Published)
                 return;
 
+            //if it's a brand new entity, then this shouldn't affect the sort order of the document
+            if (c.IsNewEntity())
+                return;
+
+            //if the sort order didn't change and the published state didn't change then we don't need to continue
+            if (c.WasPropertyDirty("SortOrder") == false
+                && c.WasPropertyDirty("Published") == false)
+            {
+                return;
+            }
+
             using (var safeXml = GetSafeXmlWriter(false))
             {
                 //TODO: This can be null: safeXml.Xml!!!!

From 5b5e1847eba2dc4e1b5ad3257a54f29e0ecc4588 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 25 Nov 2016 18:08:18 +0100
Subject: [PATCH 30/52] Updates legacy CMSNode and Document to use the PetaPoco
 Database intead of SqlHelper for the methods that the xml cache uses to
 update itself (so it's using one connection)

---
 src/umbraco.cms/businesslogic/CMSNode.cs      | 30 +++++++++----------
 src/umbraco.cms/businesslogic/web/Document.cs | 10 +++++--
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs
index 632227a3c5..773c3da4c4 100644
--- a/src/umbraco.cms/businesslogic/CMSNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSNode.cs
@@ -1103,23 +1103,24 @@ order by level,sortOrder";
 
         protected virtual XmlNode GetPreviewXml(XmlDocument xd, Guid version)
         {
+            var xmlDoc = new XmlDocument();
 
-            XmlDocument xmlDoc = new XmlDocument();
-            using (XmlReader xmlRdr = SqlHelper.ExecuteXmlReader(
-                                                       "select xml from cmsPreviewXml where nodeID = @nodeId and versionId = @versionId",
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@versionId", version)))
-            {
-                xmlDoc.Load(xmlRdr);
-            }
+            var xmlStr = ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<string>(
+                "select xml from cmsPreviewXml where nodeID = @nodeId and versionId = @versionId",
+                new { nodeId = Id, versionId = version });
 
+            if (xmlStr.IsNullOrWhiteSpace()) return null;
+
+            xmlDoc.LoadXml(xmlStr);
+            
             return xd.ImportNode(xmlDoc.FirstChild, true);
         }
 
         protected internal virtual bool PreviewExists(Guid versionId)
         {
-            return (SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsPreviewXml WHERE nodeId=@nodeId and versionId = @versionId",
-                        SqlHelper.CreateParameter("@nodeId", Id), SqlHelper.CreateParameter("@versionId", versionId)) != 0);
+            return ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<int>(
+                        "SELECT COUNT(nodeId) FROM cmsPreviewXml WHERE nodeId=@nodeId and versionId = @versionId",
+                        new {nodeId = Id, versionId = versionId}) != 0;
 
         }
 
@@ -1133,11 +1134,10 @@ order by level,sortOrder";
         {
             string sql = PreviewExists(versionId) ? "UPDATE cmsPreviewXml SET xml = @xml, timestamp = @timestamp WHERE nodeId=@nodeId AND versionId = @versionId"
                                 : "INSERT INTO cmsPreviewXml(nodeId, versionId, timestamp, xml) VALUES (@nodeId, @versionId, @timestamp, @xml)";
-            SqlHelper.ExecuteNonQuery(sql,
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@versionId", versionId),
-                                      SqlHelper.CreateParameter("@timestamp", DateTime.Now),
-                                      SqlHelper.CreateParameter("@xml", x.OuterXml));
+
+            ApplicationContext.Current.DatabaseContext.Database.Execute(
+                sql, new {nodeId = Id, versionId = versionId, timestamp = DateTime.Now, xml = x.OuterXml});
+            
         }
 
         protected void PopulateCMSNodeFromReader(IRecordsReader dr)
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index 43f375671e..7ae25c4731 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -1551,9 +1551,13 @@ namespace umbraco.cms.businesslogic.web
         private XmlNode importXml()
         {
             XmlDocument xmlDoc = new XmlDocument();
-            XmlReader xmlRdr = SqlHelper.ExecuteXmlReader(string.Format(
-                                                       "select xml from cmsContentXml where nodeID = {0}", Id));
-            xmlDoc.Load(xmlRdr);
+
+            var xmlStr = ApplicationContext.Current.DatabaseContext.Database.ExecuteScalar<string>(
+                "select xml from cmsContentXml where nodeID = @nodeId", new {nodeId = Id});
+
+            if (xmlStr.IsNullOrWhiteSpace()) return null;
+
+            xmlDoc.LoadXml(xmlStr);
 
             return xmlDoc.FirstChild;
         }

From ee3a4614c3e3c14d4885eee1b312ecaf25f9cc3e Mon Sep 17 00:00:00 2001
From: Sebastiaan Janssen <sebastiaan@umbraco.com>
Date: Fri, 25 Nov 2016 22:18:35 +0100
Subject: [PATCH 31/52] Refactor all usages of SqlHelper, ExecuteReader and
 ExecuteXmlReader into using blocks

---
 src/SQLCE4Umbraco/SqlCEInstaller.cs           |  46 +--
 src/SQLCE4Umbraco/SqlCETableUtility.cs        |  28 +-
 src/Umbraco.Web/UI/Controls/UmbracoControl.cs |   7 +-
 .../UI/Controls/UmbracoUserControl.cs         |   3 +-
 .../umbraco.presentation/content.cs           |   4 +
 .../umbraco.presentation/library.cs           |  16 +-
 src/Umbraco.Web/umbraco.presentation/macro.cs |   4 +
 .../umbraco.presentation/template.cs          |  13 +-
 .../umbraco/Trees/loadMacros.cs               |  10 +-
 .../umbraco/create/macroTasks.cs              |   5 +-
 .../RelationTypes/EditRelationType.aspx.cs    |   5 +-
 .../umbraco/dialogs/editMacro.aspx.cs         |  25 +-
 .../umbraco/dialogs/insertMacro.aspx.cs       | 140 +++----
 .../umbraco/dialogs/umbracoField.aspx.cs      |  37 +-
 .../plugins/tinymce3/insertMacro.aspx.cs      |  16 +-
 .../umbraco/settings/editTemplate.aspx.cs     |  27 +-
 .../umbraco/uQuery/PreValueExtensions.cs      |  10 +-
 .../umbraco/uQuery/RelationTypeExtensions.cs  |  19 +-
 .../umbraco/uQuery/uQuery-Content.cs          |   4 +-
 .../umbraco/uQuery/uQuery-DataTypes.cs        |   3 +-
 .../umbraco/uQuery/uQuery-PreValues.cs        |  49 +--
 .../uQuery/uQuery-UmbracoObjectType.cs        |   9 +-
 .../umbraco/uQuery/uQuery.cs                  |  33 +-
 .../TagsAutoCompleteHandler.ashx.cs           |  60 +--
 .../BasePages/BasePage.cs                     |   4 +-
 src/umbraco.businesslogic/Log.cs              | 131 ++++---
 src/umbraco.businesslogic/User.cs             |  31 +-
 src/umbraco.cms/businesslogic/CMSNode.cs      | 259 +++++++-----
 src/umbraco.cms/businesslogic/Content.cs      | 174 +++++----
 src/umbraco.cms/businesslogic/ContentType.cs  | 186 +++++----
 src/umbraco.cms/businesslogic/Dictionary.cs   |   3 +
 .../businesslogic/Packager/Package.cs         | 118 +++---
 .../businesslogic/Property/Property.cs        |  64 +--
 src/umbraco.cms/businesslogic/RecycleBin.cs   |  11 +-
 src/umbraco.cms/businesslogic/Tags/Tag.cs     | 110 +++---
 .../businesslogic/datatype/BaseDataType.cs    |  21 +-
 .../datatype/DataEditorSettingsStorage.cs     |  26 +-
 .../businesslogic/datatype/DefaultData.cs     |   3 +
 .../datatype/DefaultPreValueEditor.cs         |  28 +-
 .../businesslogic/datatype/PreValue.cs        | 104 ++---
 .../businesslogic/datatype/PreValues.cs       |  45 +--
 .../businesslogic/language/Item.cs            |   4 +-
 .../businesslogic/language/Language.cs        |   3 +-
 src/umbraco.cms/businesslogic/macro/Macro.cs  |   6 +-
 .../businesslogic/macro/MacroProperty.cs      |  48 ++-
 .../businesslogic/macro/macroPropertyType.cs  |   4 +
 .../businesslogic/member/Member.cs            | 108 ++---
 .../businesslogic/member/MemberGroup.cs       |   8 +-
 .../propertytype/PropertyTypeGroup.cs         |  74 ++--
 .../propertytype/propertytype.cs              | 139 ++++---
 .../businesslogic/relation/Relation.cs        |   4 +
 .../businesslogic/relation/RelationType.cs    |   7 +-
 src/umbraco.cms/businesslogic/task/Task.cs    |   4 +-
 .../businesslogic/task/TaskType.cs            |   4 +
 .../businesslogic/template/Template.cs        |   3 +-
 src/umbraco.cms/businesslogic/web/Document.cs |  60 +--
 .../businesslogic/web/DocumentType.cs         |  20 +-
 .../businesslogic/workflow/Notification.cs    |   3 +-
 .../SqlHelpers/MySql/MySqlInstaller.cs        |   3 +-
 .../SqlServer/SqlServerTableUtility.cs        |  28 +-
 .../Installer/DefaultInstallerUtility.cs      |   9 +-
 src/umbraco.editorControls/BaseDataType.cs    | 128 +++---
 src/umbraco.editorControls/DefaultData.cs     | 145 +++----
 .../DefaultDataKeyValue.cs                    |  17 +-
 .../DefaultPrevalueEditor.cs                  |  59 +--
 .../KeyValuePrevalueEditor.cs                 | 204 +++++-----
 .../PickerRelationsDataEditor.cs              |  13 +-
 .../PickerRelationsEventHandler.cs            |   9 +-
 .../SettingControls/Pickers/Field.cs          |  16 +-
 .../imagecropper/PrevalueEditor.cs            |  32 +-
 .../macrocontainer/PrevalueEditor.cs          |  23 +-
 .../mediapicker/MediaPickerPrevalueEditor.cs  |  48 ++-
 .../memberpicker/memberPicker.cs              |  34 +-
 .../tags/PrevalueEditor.cs                    |  46 ++-
 .../tinymce/tinyMCEPreValueConfigurator.cs    | 164 ++++----
 .../ultimatePickerPrevalueEditor.cs           |  50 +--
 .../uploadfield/uploadFieldPreValue.cs        |  40 +-
 .../usercontrolPrevalueEditor.cs              | 369 +++++++++---------
 78 files changed, 2143 insertions(+), 1684 deletions(-)

diff --git a/src/SQLCE4Umbraco/SqlCEInstaller.cs b/src/SQLCE4Umbraco/SqlCEInstaller.cs
index aeb40ed811..80a669e59c 100644
--- a/src/SQLCE4Umbraco/SqlCEInstaller.cs
+++ b/src/SQLCE4Umbraco/SqlCEInstaller.cs
@@ -21,15 +21,15 @@ namespace SqlCE4Umbraco
     public class SqlCEInstaller : DefaultInstallerUtility<SqlCEHelper>
     {
         #region Private Constants
-       
+
         /// <summary>The latest database version this installer supports.</summary>
         private const DatabaseVersion LatestVersionSupported = DatabaseVersion.Version4_8;
 
         /// <summary>The specifications to determine the database version.</summary>
         private static readonly VersionSpecs[] m_VersionSpecs = new VersionSpecs[] {
-					new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8), 
-					new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),        
-					new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
+                    new VersionSpecs("SELECT CONSTRAINT_NAME FROM INFORMATION_SCHEMA.REFERENTIAL_CONSTRAINTS LEFT OUTER JOIN umbracoApp ON appAlias = appAlias WHERE CONSTRAINT_NAME = 'FK_umbracoUser2app_umbracoApp'", 0, DatabaseVersion.Version4_8),
+                    new VersionSpecs("SELECT id FROM umbracoNode WHERE id = -21", 1, DatabaseVersion.Version4_1),
+                    new VersionSpecs("SELECT action FROM umbracoAppTree",DatabaseVersion.Version4),
                     new VersionSpecs("SELECT description FROM cmsContentType",DatabaseVersion.Version3),
                     new VersionSpecs("SELECT id FROM sysobjects",DatabaseVersion.None) };
 
@@ -43,8 +43,9 @@ namespace SqlCE4Umbraco
         public override bool CanConnect
         {
             get
-            {                
-                SqlHelper.CreateEmptyDatabase();
+            {
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.CreateEmptyDatabase();
                 return base.CanConnect;
             }
         }
@@ -93,22 +94,22 @@ namespace SqlCE4Umbraco
 
         #region DefaultInstaller Members       
 
-		/// <summary>
-		/// Returns the sql to do a full install
-		/// </summary>
-		protected override string FullInstallSql
-		{
-			get { return string.Empty; }
-		}
+        /// <summary>
+        /// Returns the sql to do a full install
+        /// </summary>
+        protected override string FullInstallSql
+        {
+            get { return string.Empty; }
+        }
 
 
-		/// <summary>
-		/// Returns the sql to do an upgrade
-		/// </summary>
-		protected override string UpgradeSql
-		{
-			get { return string.Empty; }
-		}
+        /// <summary>
+        /// Returns the sql to do an upgrade
+        /// </summary>
+        protected override string UpgradeSql
+        {
+            get { return string.Empty; }
+        }
 
         // We need to override this as the default way of detection a db connection checks for systables that doesn't exist
         // in a CE db
@@ -123,8 +124,9 @@ namespace SqlCE4Umbraco
             // verify connection
             try
             {
-                if (SqlCeApplicationBlock.VerifyConnection(base.SqlHelper.ConnectionString))
-                    return DatabaseVersion.None;
+                using (var sqlHelper = SqlHelper)
+                    if (SqlCeApplicationBlock.VerifyConnection(sqlHelper.ConnectionString))
+                        return DatabaseVersion.None;
             }
             catch (Exception e)
             {
diff --git a/src/SQLCE4Umbraco/SqlCETableUtility.cs b/src/SQLCE4Umbraco/SqlCETableUtility.cs
index 7c32252d20..cac6e0d784 100644
--- a/src/SQLCE4Umbraco/SqlCETableUtility.cs
+++ b/src/SQLCE4Umbraco/SqlCETableUtility.cs
@@ -37,13 +37,15 @@ namespace SqlCE4Umbraco
             ITable table = null;
 
             // get name in correct casing
-            name = SqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
-                                                          SqlHelper.CreateParameter("name", name));
+            using (var sqlHelper = SqlHelper)
+                name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
+                                                          sqlHelper.CreateParameter("name", name));
             if (name != null)
             {
                 table = new DefaultTable(name);
 
-                using (IRecordsReader reader = SqlHelper.ExecuteReader(
+                using (var sqlHelper = SqlHelper)
+                using (IRecordsReader reader = sqlHelper.ExecuteReader(
                         @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
                           FROM sys.tables AS t
                             JOIN sys.columns AS c ON t.object_id = c.object_id
@@ -51,7 +53,7 @@ namespace SqlCE4Umbraco
                             JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
                             JOIN sys.types st ON ty.system_type_id = st.user_type_id
                           WHERE t.name = @name
-                          ORDER BY c.column_id", SqlHelper.CreateParameter("name", name)))
+                          ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
                 {
                     while (reader.Read())
                     {
@@ -112,7 +114,8 @@ namespace SqlCE4Umbraco
 
             // create query
             StringBuilder createTableQuery = new StringBuilder();
-            createTableQuery.AppendFormat("CREATE TABLE [{0}] (", SqlHelper.EscapeString(table.Name));
+            using (var sqlHelper = SqlHelper)
+                createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
 
             // add fields
             while (hasNext)
@@ -136,7 +139,8 @@ namespace SqlCE4Umbraco
             // execute query
             try
             {
-                SqlHelper.ExecuteNonQuery(createTableQuery.ToString());
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
             }
             catch (Exception executeException)
             {
@@ -154,13 +158,15 @@ namespace SqlCE4Umbraco
             Debug.Assert(table != null && field != null);
 
             StringBuilder addColumnQuery = new StringBuilder();
-            addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
-                                        SqlHelper.EscapeString(table.Name),
-                                        SqlHelper.EscapeString(field.Name),
-                                        SqlHelper.EscapeString(GetDatabaseType(field)));
+            using (var sqlHelper = SqlHelper)
+                addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
+                                        sqlHelper.EscapeString(table.Name),
+                                        sqlHelper.EscapeString(field.Name),
+                                        sqlHelper.EscapeString(GetDatabaseType(field)));
             try
             {
-                SqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
             }
             catch (Exception executeException)
             {
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
index 4d8bd4ce69..bc633b22a3 100644
--- a/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
+++ b/src/Umbraco.Web/UI/Controls/UmbracoControl.cs
@@ -84,9 +84,10 @@ namespace Umbraco.Web.UI.Controls
             get { return _url ?? (_url = new UrlHelper(new RequestContext(new HttpContextWrapper(Context), new RouteData()))); }
         }
 
-		/// <summary>
-		/// Returns the legacy SqlHelper
-		/// </summary>
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
 		protected ISqlHelper SqlHelper
 		{
 			get { return Application.SqlHelper; }
diff --git a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
index b60c519dd4..2a18413ace 100644
--- a/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
+++ b/src/Umbraco.Web/UI/Controls/UmbracoUserControl.cs
@@ -123,8 +123,9 @@ namespace Umbraco.Web.UI.Controls
         }
 
         /// <summary>
-        /// Returns the legacy SqlHelper
+        /// Unused, please do not use
         /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected ISqlHelper SqlHelper
         {
             get { return global::umbraco.BusinessLogic.Application.SqlHelper; }
diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 777fe80782..7b7a24e63d 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -152,6 +152,10 @@ namespace umbraco
             get { return _xmlContent == null; }
         }
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/Umbraco.Web/umbraco.presentation/library.cs b/src/Umbraco.Web/umbraco.presentation/library.cs
index 5047aef271..8bd94aa5b6 100644
--- a/src/Umbraco.Web/umbraco.presentation/library.cs
+++ b/src/Umbraco.Web/umbraco.presentation/library.cs
@@ -77,9 +77,13 @@ namespace umbraco
 
         #region Properties
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
-            get { return umbraco.BusinessLogic.Application.SqlHelper; }
+            get { return Application.SqlHelper; }
         }
 
         #endregion
@@ -1275,8 +1279,9 @@ namespace umbraco
             XmlDocument xd = new XmlDocument();
             xd.LoadXml("<preValues/>");
 
-            using (IRecordsReader dr = SqlHelper.ExecuteReader("Select id, [value] from cmsDataTypeprevalues where DataTypeNodeId = @dataTypeId order by sortorder",
-                SqlHelper.CreateParameter("@dataTypeId", DataTypeId)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("Select id, [value] from cmsDataTypeprevalues where DataTypeNodeId = @dataTypeId order by sortorder",
+                sqlHelper.CreateParameter("@dataTypeId", DataTypeId)))
             {
                 while (dr.Read())
                 {
@@ -1298,8 +1303,9 @@ namespace umbraco
         {
             try
             {
-                return SqlHelper.ExecuteScalar<string>("select [value] from cmsDataTypePreValues where id = @id",
-                                                       SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    return sqlHelper.ExecuteScalar<string>("select [value] from cmsDataTypePreValues where id = @id",
+                        sqlHelper.CreateParameter("@id", Id));
             }
             catch
             {
diff --git a/src/Umbraco.Web/umbraco.presentation/macro.cs b/src/Umbraco.Web/umbraco.presentation/macro.cs
index 77027749e2..6d2936cd9a 100644
--- a/src/Umbraco.Web/umbraco.presentation/macro.cs
+++ b/src/Umbraco.Web/umbraco.presentation/macro.cs
@@ -64,6 +64,10 @@ namespace umbraco
         private const string MacrosAddedKey = "macrosAdded";
         public IList<Exception> Exceptions = new List<Exception>();
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/Umbraco.Web/umbraco.presentation/template.cs b/src/Umbraco.Web/umbraco.presentation/template.cs
index dfdad324e2..4290ce2acf 100644
--- a/src/Umbraco.Web/umbraco.presentation/template.cs
+++ b/src/Umbraco.Web/umbraco.presentation/template.cs
@@ -468,12 +468,14 @@ namespace umbraco
 
 
         #endregion
-
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
-
         #region constructors
 
         public static string GetMasterPageName(int templateID)
@@ -497,11 +499,12 @@ namespace umbraco
             var t = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem<template>(
                string.Format("{0}{1}", CacheKeys.TemplateFrontEndCacheKey, tId), () =>
                {
-                   using (var templateData = SqlHelper.ExecuteReader(@"select nodeId, alias, node.parentID as master, text, design
+                   using (var sqlHelper = Application.SqlHelper)
+                   using (var templateData = sqlHelper.ExecuteReader(@"select nodeId, alias, node.parentID as master, text, design
 from cmsTemplate
 inner join umbracoNode node on (node.id = cmsTemplate.nodeId)
 where nodeId = @templateID",
-                           SqlHelper.CreateParameter("@templateID", templateID)))
+                           sqlHelper.CreateParameter("@templateID", templateID)))
                     {
                        if (templateData.Read())
                        {
@@ -515,7 +518,7 @@ where nodeId = @templateID",
                            if (!templateData.IsNull("design"))
                                _templateDesign = templateData.GetString("design");
                        }
-                   }
+                    }
                    return this;
                });
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
index 8d5e347390..18754f6c75 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadMacros.cs
@@ -44,9 +44,13 @@ namespace umbraco
             rootNode.NodeID = "init";
         }
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
-            get { return umbraco.BusinessLogic.Application.SqlHelper; }
+            get { return Application.SqlHelper; }
         }
 
         /// <summary>
@@ -70,9 +74,9 @@ function openMacro(id) {
         /// <param name="tree"></param>
         public override void Render(ref XmlTree tree)
         {
-            using (IRecordsReader macros = SqlHelper.ExecuteReader("select id, macroName from cmsMacro order by macroName"))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader macros = sqlHelper.ExecuteReader("select id, macroName from cmsMacro order by macroName"))
             {
-                
                 while (macros.Read())
                 {
                     XmlTreeNode xNode = XmlTreeNode.Create(this);
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
index 5ad5999eb7..cf074a3cbd 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/create/macroTasks.cs
@@ -12,7 +12,10 @@ namespace umbraco
 {
     public class macroTasks : LegacyDialogTask
     {
-        
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
index da2d0446b8..fba01a857d 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/developer/RelationTypes/EditRelationType.aspx.cs
@@ -82,7 +82,8 @@ namespace umbraco.cms.presentation.developer.RelationTypes
 				{
 					this._relations = new List<ReadOnlyRelation>();
 
-				    using (var reader = uQuery.SqlHelper.ExecuteReader(@"
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    using (var reader = sqlHelper.ExecuteReader(@"
                         SELECT  A.id, 
                                 A.parentId,
 		                        B.[text] AS parentText,
@@ -114,7 +115,7 @@ namespace umbraco.cms.presentation.developer.RelationTypes
 					}
 				}
 
-				return this._relations;
+			    return this._relations;
 			}
 		}
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
index 79dd83c5f7..677790a5e4 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/editMacro.aspx.cs
@@ -125,17 +125,22 @@ namespace umbraco.dialogs
 				}
 				else
 				{
-					IRecordsReader macroRenderings;
-					if (Request.GetItemAsString("editor") != "")
-						macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName");
-					else
-						macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro order by macroName");
+				    string query;
+				    if (Request.GetItemAsString("editor") != "")
+				        query = "select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName";
+				    else
+				        query = "select macroAlias, macroName from cmsMacro order by macroName";
 
-					umb_macroAlias.DataSource = macroRenderings;
-					umb_macroAlias.DataValueField = "macroAlias";
-					umb_macroAlias.DataTextField = "macroName";
-					umb_macroAlias.DataBind();
-					macroRenderings.Close();
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    {
+                        using (IRecordsReader macroRenderings = sqlHelper.ExecuteReader(query))
+                        {
+                            umb_macroAlias.DataSource = macroRenderings;
+                            umb_macroAlias.DataValueField = "macroAlias";
+                            umb_macroAlias.DataTextField = "macroName";
+                            umb_macroAlias.DataBind();
+                        }
+                    }
 				}
 			}
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
index 9d8286e098..defeb9276c 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/insertMacro.aspx.cs
@@ -17,12 +17,12 @@ using umbraco.businesslogic.Exceptions;
 
 namespace umbraco.dialogs
 {
-	/// <summary>
-	/// Summary description for insertMacro.
-	/// </summary>
-	public partial class insertMacro : BasePages.UmbracoEnsuredPage
-	{
-		protected Button Button1;
+    /// <summary>
+    /// Summary description for insertMacro.
+    /// </summary>
+    public partial class insertMacro : BasePages.UmbracoEnsuredPage
+    {
+        protected Button Button1;
 
         protected override void OnInit(EventArgs e)
         {
@@ -33,44 +33,44 @@ namespace umbraco.dialogs
                 throw new UserAuthorizationException("The current user doesn't have access to the section/app");
         }
 
-		protected void Page_Load(object sender, EventArgs e)
-		{
-            pane_edit.Text = ui.Text("general", "edit",this.getUser()) + " " + ui.Text("general", "macro",this.getUser());
-            pane_insert.Text = ui.Text("general", "insert",this.getUser()) + " " + ui.Text("general", "macro",this.getUser());
+        protected void Page_Load(object sender, EventArgs e)
+        {
+            pane_edit.Text = ui.Text("general", "edit", this.getUser()) + " " + ui.Text("general", "macro", this.getUser());
+            pane_insert.Text = ui.Text("general", "insert", this.getUser()) + " " + ui.Text("general", "macro", this.getUser());
 
-			if (Request["macroID"] != null || Request["macroAlias"] != null) 
-			{
-				// Put user code to initialize the page here
-				cms.businesslogic.macro.Macro m;
-				if (helper.Request("macroID") != "")
-					m = new cms.businesslogic.macro.Macro(int.Parse(helper.Request("macroID")));
-				else
-					m = cms.businesslogic.macro.Macro.GetByAlias(helper.Request("macroAlias"));
+            if (Request["macroID"] != null || Request["macroAlias"] != null)
+            {
+                // Put user code to initialize the page here
+                cms.businesslogic.macro.Macro m;
+                if (helper.Request("macroID") != "")
+                    m = new cms.businesslogic.macro.Macro(int.Parse(helper.Request("macroID")));
+                else
+                    m = cms.businesslogic.macro.Macro.GetByAlias(helper.Request("macroAlias"));
 
 			    foreach (var mp in m.Properties) {
-		
-					var macroAssembly = mp.Type.Assembly;
-					var macroType = mp.Type.Type;
-					try 
-					{
 
-                        var assembly = Assembly.LoadFrom( IOHelper.MapPath(SystemDirectories.Bin + "/" + macroAssembly + ".dll"));
+                    var macroAssembly = mp.Type.Assembly;
+                    var macroType = mp.Type.Type;
+                    try
+                    {
 
-						Type type = assembly.GetType(macroAssembly+"."+macroType);
-						var typeInstance = Activator.CreateInstance(type) as interfaces.IMacroGuiRendering;
-						if (typeInstance != null) 
-						{
-							var control = Activator.CreateInstance(type) as Control;	
-							control.ID = mp.Alias;
-							if (Request[mp.Alias] != null) 
-							{
-								if (Request[mp.Alias] != "") 
-								{
-									type.GetProperty("Value").SetValue(control, Convert.ChangeType(Request[mp.Alias], type.GetProperty("Value").PropertyType), null);
-								}
-							}
+                        var assembly = Assembly.LoadFrom(IOHelper.MapPath(SystemDirectories.Bin + "/" + macroAssembly + ".dll"));
 
-							// register alias
+                        Type type = assembly.GetType(macroAssembly + "." + macroType);
+                        var typeInstance = Activator.CreateInstance(type) as interfaces.IMacroGuiRendering;
+                        if (typeInstance != null)
+                        {
+                            var control = Activator.CreateInstance(type) as Control;
+                            control.ID = mp.Alias;
+                            if (Request[mp.Alias] != null)
+                            {
+                                if (Request[mp.Alias] != "")
+                                {
+                                    type.GetProperty("Value").SetValue(control, Convert.ChangeType(Request[mp.Alias], type.GetProperty("Value").PropertyType), null);
+                                }
+                            }
+
+                            // register alias
                             var pp = new uicontrols.PropertyPanel();
                             pp.Text = mp.Name;
                             pp.Controls.Add(control);
@@ -83,35 +83,43 @@ namespace umbraco.dialogs
 							macroProperties.Controls.Add(control);
 							macroProperties.Controls.Add(new LiteralControl("</td></tr>"));
                             */
-						} 
-						else 
-						{						
-							Trace.Warn("umbEditContent", "Type doesn't exist or is not umbraco.interfaces.DataFieldI ('" + macroAssembly + "." + macroType + "')");
-						}
+                        }
+                        else
+                        {
+                            Trace.Warn("umbEditContent", "Type doesn't exist or is not umbraco.interfaces.DataFieldI ('" + macroAssembly + "." + macroType + "')");
+                        }
 
-					} 
-					catch (Exception fieldException)
-					{
-						Trace.Warn("umbEditContent", "Error creating type '" + macroAssembly + "." + macroType + "'", fieldException);
-					}
-				}
-			} 
-			else 
-			{
-				IRecordsReader macroRenderings;
+                    }
+                    catch (Exception fieldException)
+                    {
+                        Trace.Warn("umbEditContent", "Error creating type '" + macroAssembly + "." + macroType + "'", fieldException);
+                    }
+                }
+            }
+            else
+            {
+                IRecordsReader macroRenderings;
 				if (helper.Request("editor") != "")
-					macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName");
-				else
-					macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro order by macroName");
-				
-				macroAlias.DataSource = macroRenderings;
-				macroAlias.DataValueField = "macroAlias";
-				macroAlias.DataTextField = "macroName";
-				macroAlias.DataBind();
-				macroRenderings.Close();
+                {
+                    const string query = "select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName";
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    using (var renderings = sqlHelper.ExecuteReader(query))
+                        macroRenderings = renderings;
+                }
+                else
+                {
+                    const string query = "select macroAlias, macroName from cmsMacro order by macroName";
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    using (var renderings = sqlHelper.ExecuteReader(query))
+                        macroRenderings = renderings;
+                }
 
-			}
-
-		}
-	}
+                macroAlias.DataSource = macroRenderings;
+                macroAlias.DataValueField = "macroAlias";
+                macroAlias.DataTextField = "macroName";
+                macroAlias.DataBind();
+                macroRenderings.Close();
+            }
+        }
+    }
 }
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
index d875b856e9..8dbae8e920 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
@@ -73,27 +73,30 @@ namespace umbraco.dialogs
 			fieldPicker.StandardPropertiesLabel = ui.Text("templateEditor", "standardFields");
 			fieldPicker.CustomPropertiesLabel = ui.Text("templateEditor", "customFields");
 
-			IRecordsReader dataTypes = SqlHelper.ExecuteReader(fieldSql);
-			fieldPicker.DataTextField = "alias";
-			fieldPicker.DataValueField = "alias";
-			fieldPicker.DataSource = dataTypes;
-			fieldPicker.DataBind();
-			fieldPicker.Attributes.Add("onChange", "document.forms[0].field.value = document.forms[0]." + fieldPicker.ClientID + "[document.forms[0]." + fieldPicker.ClientID + ".selectedIndex].value;");
-			dataTypes.Close();
-
-			altFieldPicker.ChooseText = ui.Text("templateEditor", "chooseField");
+            using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+            using (IRecordsReader dataTypes = sqlHelper.ExecuteReader(fieldSql))
+		    {
+		        fieldPicker.DataTextField = "alias";
+		        fieldPicker.DataValueField = "alias";
+		        fieldPicker.DataSource = dataTypes;
+		        fieldPicker.DataBind();
+                fieldPicker.Attributes.Add("onChange", "document.forms[0].field.value = document.forms[0]." + fieldPicker.ClientID + "[document.forms[0]." + fieldPicker.ClientID + ".selectedIndex].value;");
+            }
+		    altFieldPicker.ChooseText = ui.Text("templateEditor", "chooseField");
 			altFieldPicker.StandardPropertiesLabel = ui.Text("templateEditor", "standardFields");
 			altFieldPicker.CustomPropertiesLabel = ui.Text("templateEditor", "customFields");
 
-			IRecordsReader dataTypes2 = SqlHelper.ExecuteReader(fieldSql);
-			altFieldPicker.DataTextField = "alias";
-			altFieldPicker.DataValueField = "alias";
-			altFieldPicker.DataSource = dataTypes2;
-			altFieldPicker.DataBind();
-			altFieldPicker.Attributes.Add("onChange", "document.forms[0].useIfEmpty.value = document.forms[0]." + altFieldPicker.ClientID + "[document.forms[0]." + altFieldPicker.ClientID + ".selectedIndex].value;");
-			dataTypes2.Close();
+            using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+            using (IRecordsReader dataTypes2 = sqlHelper.ExecuteReader(fieldSql))
+		    {
+		        altFieldPicker.DataTextField = "alias";
+		        altFieldPicker.DataValueField = "alias";
+		        altFieldPicker.DataSource = dataTypes2;
+		        altFieldPicker.DataBind();
+                altFieldPicker.Attributes.Add("onChange", "document.forms[0].useIfEmpty.value = document.forms[0]." + altFieldPicker.ClientID + "[document.forms[0]." + altFieldPicker.ClientID + ".selectedIndex].value;");
+            }
 
-			// Pre values
+		    // Pre values
 			if (!m_IsDictionaryMode)
 			{
 				foreach (string s in preValuesSource)
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
index 7425522783..8edb4fced0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/plugins/tinymce3/insertMacro.aspx.cs
@@ -165,10 +165,20 @@ namespace umbraco.presentation.tinymce3
             {
                 IRecordsReader macroRenderings;
                 if (Request["editor"] != "")
-                    macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName");
+                {
+                    const string query = "select macroAlias, macroName from cmsMacro where macroUseInEditor = 1 order by macroName";
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    using (var renderings = sqlHelper.ExecuteReader(query))
+                        macroRenderings = renderings;
+                }
                 else
-                    macroRenderings = SqlHelper.ExecuteReader("select macroAlias, macroName from cmsMacro order by macroName");
-
+                {
+                    const string query = "select macroAlias, macroName from cmsMacro order by macroName";
+                    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                    using (var renderings = sqlHelper.ExecuteReader(query))
+                        macroRenderings = renderings;
+                }
+                
                 umb_macroAlias.DataSource = macroRenderings;
                 umb_macroAlias.DataValueField = "macroAlias";
                 umb_macroAlias.DataTextField = "macroName";
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
index 8f533188cd..5aea269523 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/settings/editTemplate.aspx.cs
@@ -198,23 +198,24 @@ namespace umbraco.cms.presentation.settings
 
 		private void LoadMacros()
 		{
-			IRecordsReader macroRenderings =
-				SqlHelper.ExecuteReader("select id, macroAlias, macroName from cmsMacro order by macroName");
-
-			rpt_macros.DataSource = macroRenderings;
-			rpt_macros.DataBind();
-
-			macroRenderings.Close();
+		    using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+            using (IRecordsReader macroRenderings = 
+                sqlHelper.ExecuteReader("select id, macroAlias, macroName from cmsMacro order by macroName"))
+		    {
+		        rpt_macros.DataSource = macroRenderings;
+		        rpt_macros.DataBind();
+		    }
 		}
 
 		public string DoesMacroHaveSettings(string macroId)
 		{
-			if (
-				SqlHelper.ExecuteScalar<int>(string.Format("select 1 from cmsMacroProperty where macro = {0}", macroId)) ==
-				1)
-				return "1";
-			else
-				return "0";
+            using (var sqlHelper = BusinessLogic.Application.SqlHelper)
+                if (
+				    sqlHelper.ExecuteScalar<int>(string.Format("select 1 from cmsMacroProperty where macro = {0}", macroId)) ==
+				    1)
+				    return "1";
+			    else
+				    return "0";
 		}
 
 		/// <summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
index f5931a2846..9202788cf8 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/PreValueExtensions.cs
@@ -1,4 +1,5 @@
-using umbraco.cms.businesslogic.datatype;
+using umbraco.BusinessLogic;
+using umbraco.cms.businesslogic.datatype;
 
 namespace umbraco
 {
@@ -14,9 +15,10 @@ namespace umbraco
 		/// <returns>The alias</returns>
 		public static string GetAlias(this PreValue preValue)
 		{
-			using (var reader = uQuery.SqlHelper.ExecuteReader(
-				"SELECT alias FROM cmsDataTypePreValues WHERE id = @id",
-				uQuery.SqlHelper.CreateParameter("@id", preValue.Id)))
+            using(var sqlHelper = Application.SqlHelper)
+			using (var reader = sqlHelper.ExecuteReader(
+				"SELECT alias FROM cmsDataTypePreValues WHERE id = @id", 
+				sqlHelper.CreateParameter("@id", preValue.Id)))
 			{
 				var hasRows = reader.Read();
 
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
index c8fc612a93..cf796bc9f9 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/RelationTypeExtensions.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.relation;
 
 namespace umbraco
@@ -16,9 +17,12 @@ namespace umbraco
 		/// <returns>an UmbracoObjectType value</returns>
 		public static uQuery.UmbracoObjectType GetParentUmbracoObjectType(this RelationType relationType)
 		{
-			return uQuery.GetUmbracoObjectType(
-				uQuery.SqlHelper.ExecuteScalar<Guid>(
-					string.Concat("SELECT parentObjectType FROM umbracoRelationType WHERE id = ", relationType.Id)));
+		    using (var sqlHelper = Application.SqlHelper)
+		    {
+		        var guid = sqlHelper.ExecuteScalar<Guid>(
+		            string.Concat("SELECT parentObjectType FROM umbracoRelationType WHERE id = ", relationType.Id));
+		        return uQuery.GetUmbracoObjectType(guid);
+		    }
 		}
 
 		/// <summary>
@@ -28,9 +32,12 @@ namespace umbraco
 		/// <returns>an UmbracoObjectType value</returns>
 		public static uQuery.UmbracoObjectType GetChildUmbracoObjectType(this RelationType relationType)
 		{
-			return uQuery.GetUmbracoObjectType(
-				uQuery.SqlHelper.ExecuteScalar<Guid>(
-					string.Concat("SELECT childObjectType FROM umbracoRelationType WHERE id = ", relationType.Id)));
+		    using (var sqlHelper = Application.SqlHelper)
+		    {
+		        var guid = sqlHelper.ExecuteScalar<Guid>(
+		            string.Concat("SELECT childObjectType FROM umbracoRelationType WHERE id = ", relationType.Id));
+		        return uQuery.GetUmbracoObjectType(guid);
+		    }
 		}
 
 		/// <summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
index eb5d3954a4..cfab299a7e 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-Content.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic;
 
 namespace umbraco
@@ -15,7 +16,8 @@ namespace umbraco
 			if (propertyId > 0)
 			{
 				var sql = "SELECT contentNodeId FROM cmsPropertyData WHERE id = @propertyId";
-				return uQuery.SqlHelper.ExecuteScalar<int>(sql, uQuery.SqlHelper.CreateParameter("@propertyId", propertyId));
+                using (var sqlHelper = Application.SqlHelper)
+                    return sqlHelper.ExecuteScalar<int>(sql, sqlHelper.CreateParameter("@propertyId", propertyId));
 			}
 
 			return uQuery.RootNodeId;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
index 28a72cd1a1..1164d263cb 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-DataTypes.cs
@@ -35,7 +35,8 @@ namespace umbraco
 		{
 			var datatypes = new Dictionary<int, string>();
 
-			using (var reader = uQuery.SqlHelper.ExecuteReader("SELECT d.nodeId, n.text FROM cmsDataType d, umbracoNode n WHERE d.nodeId = n.id"))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var reader = sqlHelper.ExecuteReader("SELECT d.nodeId, n.text FROM cmsDataType d, umbracoNode n WHERE d.nodeId = n.id"))
 			{
 				// Go through the values from the database and store them in the array.
 				while (reader.Read())
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
index 987ceb0303..edff712c5f 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-PreValues.cs
@@ -1,6 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.datatype;
 using umbraco.cms.businesslogic.propertytype;
 using umbraco.NodeFactory;
@@ -24,20 +25,23 @@ namespace umbraco
 		/// </returns>
 		public static PreValue MakeNewPreValue(int dataTypeDefinitionId, string value, string alias = "", int sortOrder = 0)
 		{
-			var result =
-				SqlHelper.ExecuteNonQuery(
-					"INSERT INTO cmsDataTypePreValues (datatypeNodeId, value, alias, sortorder) VALUES (@dtdefid, @value, @alias, @sortorder)",
-					SqlHelper.CreateParameter("@dtdefid", dataTypeDefinitionId),
-					SqlHelper.CreateParameter("@value", value),
-					SqlHelper.CreateParameter("@alias", alias),
-					SqlHelper.CreateParameter("@sortorder", sortOrder));
+		    using (var sqlHelper = Application.SqlHelper)
+		    {
+		        var result =
+		            sqlHelper.ExecuteNonQuery(
+		                "INSERT INTO cmsDataTypePreValues (datatypeNodeId, value, alias, sortorder) VALUES (@dtdefid, @value, @alias, @sortorder)",
+		                sqlHelper.CreateParameter("@dtdefid", dataTypeDefinitionId),
+		                sqlHelper.CreateParameter("@value", value),
+		                sqlHelper.CreateParameter("@alias", alias),
+		                sqlHelper.CreateParameter("@sortorder", sortOrder));
 
-			if (result > -1)
-			{
-				return uQuery.GetPreValues(dataTypeDefinitionId).Single(x => x.Value.Equals(value) && x.GetAlias().Equals(alias) && x.SortOrder == sortOrder);
-			}
+		        if (result > -1)
+		        {
+		            return uQuery.GetPreValues(dataTypeDefinitionId).Single(x => x.Value.Equals(value) && x.GetAlias().Equals(alias) && x.SortOrder == sortOrder);
+		        }
 
-			return null;
+		        return null;
+		    }
 		}
 
 		/// <summary>
@@ -94,17 +98,18 @@ namespace umbraco
 		/// <returns></returns>
 		public static bool ReorderPreValue(int preValueId, int sortOrder)
 		{
-			var result =
-				SqlHelper.ExecuteNonQuery(
-					"UPDATE cmsDataTypePreValues SET sortorder = @sortorder WHERE id = @prevalueid",
-					SqlHelper.CreateParameter("@prevalueid", preValueId),
-					SqlHelper.CreateParameter("@sortorder", sortOrder));
-
-			if (result > 0)
-			{
-				return true;
-			}
+            using (var sqlHelper = Application.SqlHelper) { 
+                var result =
+				    sqlHelper.ExecuteNonQuery(
+					    "UPDATE cmsDataTypePreValues SET sortorder = @sortorder WHERE id = @prevalueid",
+					    sqlHelper.CreateParameter("@prevalueid", preValueId),
+					    sqlHelper.CreateParameter("@sortorder", sortOrder));
 
+			    if (result > 0)
+			    {
+				    return true;
+			    }
+            }
 			return false;
 		}
 	}
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
index f6774223ab..18e5882809 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery-UmbracoObjectType.cs
@@ -1,4 +1,5 @@
 using System;
+using umbraco.BusinessLogic;
 using Umbraco.Core;
 
 namespace umbraco
@@ -151,9 +152,11 @@ namespace umbraco
 		/// <returns>an UmbracoObjectType Enum value</returns>
 		public static UmbracoObjectType GetUmbracoObjectType(int id)
 		{
-			return uQuery.GetUmbracoObjectType(
-						uQuery.SqlHelper.ExecuteScalar<Guid>(
-							string.Concat("SELECT nodeObjectType FROM umbracoNode WHERE id = ", id)));
+		    using (var sqlHelper = Application.SqlHelper)
+		    {
+		        var guid = sqlHelper.ExecuteScalar<Guid>(string.Concat("SELECT nodeObjectType FROM umbracoNode WHERE id = ", id));
+		        return GetUmbracoObjectType(guid);
+		    }
 		}
 
 		/// <summary>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
index 00d89a1722..a98c5075d0 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/uQuery.cs
@@ -18,23 +18,21 @@ namespace umbraco
 	/// </summary>
 	public static partial class uQuery
 	{
-		/// <summary>
-		/// Gets the SqlHelper used by Umbraco
-		/// </summary>
-		public static ISqlHelper SqlHelper
-		{
-			get
-			{
-				return Application.SqlHelper;
-			}
-		}
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        public static ISqlHelper SqlHelper
+        {
+            get { return Application.SqlHelper; }
+        }
 
-		/// <summary>
-		/// Constructs the XML source from the cmsContentXml table used for Media and Members.
-		/// </summary>
-		/// <param name="umbracoObjectType">an UmbracoObjectType value</param>
-		/// <returns>XML built from the cmsContentXml table</returns>
-		public static XmlDocument GetPublishedXml(UmbracoObjectType umbracoObjectType)
+        /// <summary>
+        /// Constructs the XML source from the cmsContentXml table used for Media and Members.
+        /// </summary>
+        /// <param name="umbracoObjectType">an UmbracoObjectType value</param>
+        /// <returns>XML built from the cmsContentXml table</returns>
+        public static XmlDocument GetPublishedXml(UmbracoObjectType umbracoObjectType)
 		{
 			try
 			{
@@ -43,7 +41,8 @@ namespace umbraco
 				var xmlDoc = new XmlDocument();
 				var sql = "SELECT umbracoNode.id, umbracoNode.parentId, umbracoNode.sortOrder, cmsContentXml.xml FROM umbracoNode INNER JOIN cmsContentXml ON cmsContentXml.nodeId = umbracoNode.id AND umbracoNode.nodeObjectType = @nodeObjectType ORDER BY umbracoNode.level, umbracoNode.sortOrder";
 
-				using (var dr = uQuery.SqlHelper.ExecuteReader(sql, uQuery.SqlHelper.CreateParameter("@nodeObjectType", umbracoObjectType.GetGuid())))
+                using (var sqlHelper = Application.SqlHelper)
+                using (var dr = sqlHelper.ExecuteReader(sql, sqlHelper.CreateParameter("@nodeObjectType", umbracoObjectType.GetGuid())))
 				{
 					while (dr.Read())
 					{
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
index 3ba7a1a6b8..d4809116f5 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/webservices/TagsAutoCompleteHandler.ashx.cs
@@ -37,8 +37,7 @@ namespace umbraco.presentation.umbraco.webservices
             string id = context.Request.QueryString["id"];
            
             string sql;
-
-            IRecordsReader rr;
+            IRecordsReader reader = null;
 
             try
             {
@@ -47,50 +46,67 @@ namespace umbraco.presentation.umbraco.webservices
                 {
                     sql = @"SELECT TOP (20) tag FROM cmsTags WHERE tag LIKE @prefix AND cmsTags.id not in 
                         (SELECT tagID FROM cmsTagRelationShip WHERE NodeId = @nodeId) AND cmstags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + " = @group;";
-
-                    rr = SqlHelper.ExecuteReader(sql,
-                        SqlHelper.CreateParameter("@count", count),
-                        SqlHelper.CreateParameter("@prefix", prefixText + "%"),
-                        SqlHelper.CreateParameter("@nodeId", id),
-                        SqlHelper.CreateParameter("@group", group)
-                        );
-
-
-
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var rr = sqlHelper.ExecuteReader(sql,
+                        sqlHelper.CreateParameter("@count", count),
+                        sqlHelper.CreateParameter("@prefix", prefixText + "%"),
+                        sqlHelper.CreateParameter("@nodeId", id),
+                        sqlHelper.CreateParameter("@group", group)
+                    ))
+                    {
+                        reader = rr;
+                    }
                 }
                 else
                 {
                     //fallback...
                     sql = "SELECT TOP (20) tag FROM cmsTags WHERE tag LIKE @prefix";
 
-                    rr = SqlHelper.ExecuteReader(sql,
-                       SqlHelper.CreateParameter("@count", count),
-                       SqlHelper.CreateParameter("@prefix", prefixText + "%")
-                       );
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var rr = sqlHelper.ExecuteReader(sql,
+                        sqlHelper.CreateParameter("@count", count),
+                        sqlHelper.CreateParameter("@prefix", prefixText + "%")
+                    ))
+                    {
+                        reader = rr;
+                    }
                 }
 
                 var tagList = new List<string>();
-                while (rr.Read())
+                while (reader.Read())
                 {
-                    tagList.Add(rr.GetString("tag"));
+                    tagList.Add(reader.GetString("tag"));
                 }
 
                 context.Response.Write(returnJson
-                                           ? new JavaScriptSerializer().Serialize(tagList)
-                                           : string.Join(Environment.NewLine, tagList));
+                    ? new JavaScriptSerializer().Serialize(tagList)
+                    : string.Join(Environment.NewLine, tagList));
             }
             catch (Exception ex)
             {
-				LogHelper.Error<TagsAutoCompleteHandler>("An error occurred", ex);
+                LogHelper.Error<TagsAutoCompleteHandler>("An error occurred", ex);
+            }
+            finally
+            {
+                if (reader != null)
+                {
+                    reader.Close();
+                    reader.Dispose();
+                }
             }
 
         }
-
+        
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
 
+
         public bool IsReusable
         {
             get
diff --git a/src/umbraco.businesslogic/BasePages/BasePage.cs b/src/umbraco.businesslogic/BasePages/BasePage.cs
index 8e7f1f47e1..6af70e21a9 100644
--- a/src/umbraco.businesslogic/BasePages/BasePage.cs
+++ b/src/umbraco.businesslogic/BasePages/BasePage.cs
@@ -49,9 +49,9 @@ namespace umbraco.BasePages
         protected long timeout = 0;
 
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return BusinessLogic.Application.SqlHelper; }
diff --git a/src/umbraco.businesslogic/Log.cs b/src/umbraco.businesslogic/Log.cs
index 7f3c9661a9..9ce251675f 100644
--- a/src/umbraco.businesslogic/Log.cs
+++ b/src/umbraco.businesslogic/Log.cs
@@ -59,12 +59,7 @@ namespace umbraco.BusinessLogic
         }
 
         #endregion
-
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
+        
         /// <summary>
         /// Adds the specified log item to the log.
         /// </summary>
@@ -171,12 +166,13 @@ namespace umbraco.BusinessLogic
             {
                 try
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                         "insert into umbracoLog (userId, nodeId, logHeader, logComment) values (@userId, @nodeId, @logHeader, @comment)",
-                        SqlHelper.CreateParameter("@userId", userId),
-                        SqlHelper.CreateParameter("@nodeId", nodeId),
-                        SqlHelper.CreateParameter("@logHeader", type.ToString()),
-                        SqlHelper.CreateParameter("@comment", comment));
+                        sqlHelper.CreateParameter("@userId", userId),
+                        sqlHelper.CreateParameter("@nodeId", nodeId),
+                        sqlHelper.CreateParameter("@logHeader", type.ToString()),
+                        sqlHelper.CreateParameter("@comment", comment));
                 }
                 catch (Exception e)
                 {
@@ -201,54 +197,59 @@ namespace umbraco.BusinessLogic
         {
             if (UmbracoConfig.For.UmbracoSettings().Logging.ExternalLoggerEnableAuditTrail && ExternalLogger != null)
                 return ExternalLogger.GetAuditLogReader(NodeId);
-            
-            return LogItem.ConvertIRecordsReader(SqlHelper.ExecuteReader(
-                "select userId, nodeId, logHeader, DateStamp, logComment from umbracoLog where nodeId = @id and logHeader not in ('open','system') order by DateStamp desc",
-                SqlHelper.CreateParameter("@id", NodeId)));
+
+            using (var sqlHelper = Application.SqlHelper)
+                return LogItem.ConvertIRecordsReader(sqlHelper.ExecuteReader(
+                    "select userId, nodeId, logHeader, DateStamp, logComment from umbracoLog where nodeId = @id and logHeader not in ('open','system') order by DateStamp desc",
+                    sqlHelper.CreateParameter("@id", NodeId)));
         }
 
         public List<LogItem> GetLogItems(LogTypes type, DateTime sinceDate)
         {
             if (ExternalLogger != null)
                 return ExternalLogger.GetLogItems(type, sinceDate);
-            
-            return LogItem.ConvertIRecordsReader(SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@logHeader", type.ToString()),
-                SqlHelper.CreateParameter("@dateStamp", sinceDate)));
+
+            using (var sqlHelper = Application.SqlHelper)
+                return LogItem.ConvertIRecordsReader(sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@logHeader", type.ToString()),
+                    sqlHelper.CreateParameter("@dateStamp", sinceDate)));
         }
 
         public List<LogItem> GetLogItems(int nodeId)
         {
             if (ExternalLogger != null)
                 return ExternalLogger.GetLogItems(nodeId);
-            
-            return LogItem.ConvertIRecordsReader(SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where id = @id order by dateStamp desc",
-                SqlHelper.CreateParameter("@id", nodeId)));
+
+            using (var sqlHelper = Application.SqlHelper)
+                return LogItem.ConvertIRecordsReader(sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where id = @id order by dateStamp desc",
+                    sqlHelper.CreateParameter("@id", nodeId)));
         }
 
         public List<LogItem> GetLogItems(User user, DateTime sinceDate)
         {
             if (ExternalLogger != null)
                 return ExternalLogger.GetLogItems(user, sinceDate);
-            
-            return LogItem.ConvertIRecordsReader(SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@user", user.Id),
-                SqlHelper.CreateParameter("@dateStamp", sinceDate)));
+
+            using (var sqlHelper = Application.SqlHelper)
+                return LogItem.ConvertIRecordsReader(sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@user", user.Id),
+                    sqlHelper.CreateParameter("@dateStamp", sinceDate)));
         }
 
         public List<LogItem> GetLogItems(User user, LogTypes type, DateTime sinceDate)
         {
             if (ExternalLogger != null)
                 return ExternalLogger.GetLogItems(user, type, sinceDate);
-            
-            return LogItem.ConvertIRecordsReader(SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@logHeader", type.ToString()),
-                SqlHelper.CreateParameter("@user", user.Id),
-                SqlHelper.CreateParameter("@dateStamp", sinceDate)));
+
+            using (var sqlHelper = Application.SqlHelper)
+                return LogItem.ConvertIRecordsReader(sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@logHeader", type.ToString()),
+                    sqlHelper.CreateParameter("@user", user.Id),
+                    sqlHelper.CreateParameter("@dateStamp", sinceDate)));
         }
 
         public static void CleanLogs(int maximumAgeOfLogsInMinutes)
@@ -262,8 +263,9 @@ namespace umbraco.BusinessLogic
                     DateTime oldestPermittedLogEntry = DateTime.Now.Subtract(new TimeSpan(0, maximumAgeOfLogsInMinutes, 0));
                     var formattedDate = oldestPermittedLogEntry.ToString("yyyy-MM-dd HH:mm:ss");
 
-                    SqlHelper.ExecuteNonQuery("delete from umbracoLog where datestamp < @oldestPermittedLogEntry and logHeader in ('open','system')",
-                        SqlHelper.CreateParameter("@oldestPermittedLogEntry", oldestPermittedLogEntry));
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery("delete from umbracoLog where datestamp < @oldestPermittedLogEntry and logHeader in ('open','system')",
+                        sqlHelper.CreateParameter("@oldestPermittedLogEntry", oldestPermittedLogEntry));
 
                     LogHelper.Info<Log>(string.Format("Log scrubbed.  Removed all items older than {0}", formattedDate));
                 }
@@ -285,9 +287,10 @@ namespace umbraco.BusinessLogic
         [Obsolete("Use the Instance.GetAuditLogItems method which return a list of LogItems instead")]
         public static IRecordsReader GetAuditLogReader(int NodeId)
         {
-            return SqlHelper.ExecuteReader(
-                "select u.userName as [User], logHeader as Action, DateStamp as Date, logComment as Comment from umbracoLog inner join umbracoUser u on u.id = userId where nodeId = @id and logHeader not in ('open','system') order by DateStamp desc",
-                SqlHelper.CreateParameter("@id", NodeId));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(
+                    "select u.userName as [User], logHeader as Action, DateStamp as Date, logComment as Comment from umbracoLog inner join umbracoUser u on u.id = userId where nodeId = @id and logHeader not in ('open','system') order by DateStamp desc",
+                    sqlHelper.CreateParameter("@id", NodeId));
         }
 
         /// <summary>
@@ -299,10 +302,11 @@ namespace umbraco.BusinessLogic
         [Obsolete("Use the Instance.GetLogItems method which return a list of LogItems instead")]
         public static IRecordsReader GetLogReader(LogTypes Type, DateTime SinceDate)
         {
-            return SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@logHeader", Type.ToString()),
-                SqlHelper.CreateParameter("@dateStamp", SinceDate));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@logHeader", Type.ToString()),
+                    sqlHelper.CreateParameter("@dateStamp", SinceDate));
         }
 
         /// <summary>
@@ -313,9 +317,10 @@ namespace umbraco.BusinessLogic
         [Obsolete("Use the Instance.GetLogItems method which return a list of LogItems instead")]
         public static IRecordsReader GetLogReader(int NodeId)
         {
-            return SqlHelper.ExecuteReader(
-                "select u.userName, DateStamp, logHeader, logComment from umbracoLog inner join umbracoUser u on u.id = userId where nodeId = @id",
-                SqlHelper.CreateParameter("@id", NodeId));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(
+                    "select u.userName, DateStamp, logHeader, logComment from umbracoLog inner join umbracoUser u on u.id = userId where nodeId = @id",
+                    sqlHelper.CreateParameter("@id", NodeId));
         }
 
         /// <summary>
@@ -327,10 +332,11 @@ namespace umbraco.BusinessLogic
         [Obsolete("Use the Instance.GetLogItems method which return a list of LogItems instead")]
         public static IRecordsReader GetLogReader(User user, DateTime SinceDate)
         {
-            return SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@user", user.Id),
-                SqlHelper.CreateParameter("@dateStamp", SinceDate));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@user", user.Id),
+                    sqlHelper.CreateParameter("@dateStamp", SinceDate));
         }
 
         /// <summary>
@@ -343,11 +349,12 @@ namespace umbraco.BusinessLogic
         [Obsolete("Use the Instance.GetLogItems method which return a list of LogItems instead")]
         public static IRecordsReader GetLogReader(User user, LogTypes Type, DateTime SinceDate)
         {
-            return SqlHelper.ExecuteReader(
-                "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
-                SqlHelper.CreateParameter("@logHeader", Type.ToString()),
-                SqlHelper.CreateParameter("@user", user.Id),
-                SqlHelper.CreateParameter("@dateStamp", SinceDate));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(
+                    "select userId, NodeId, DateStamp, logHeader, logComment from umbracoLog where UserId = @user and logHeader = @logHeader and DateStamp >= @dateStamp order by dateStamp desc",
+                    sqlHelper.CreateParameter("@logHeader", Type.ToString()),
+                    sqlHelper.CreateParameter("@user", user.Id),
+                    sqlHelper.CreateParameter("@dateStamp", SinceDate));
         }
 
         /// <summary>
@@ -367,10 +374,11 @@ namespace umbraco.BusinessLogic
                 ? string.Format(query, string.Empty, "limit 0," + numberOfResults) 
                 : string.Format(query, "top " + numberOfResults, string.Empty);
 
-            return SqlHelper.ExecuteReader(query, 
-                                           SqlHelper.CreateParameter("@logHeader", type.ToString()), 
-                                           SqlHelper.CreateParameter("@user", user.Id), 
-                                           SqlHelper.CreateParameter("@dateStamp", sinceDate));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteReader(query, 
+                            sqlHelper.CreateParameter("@logHeader", type.ToString()), 
+                            sqlHelper.CreateParameter("@user", user.Id), 
+                            sqlHelper.CreateParameter("@dateStamp", sinceDate));
         }
 
         #endregion
@@ -413,6 +421,9 @@ namespace umbraco.BusinessLogic
                     reader.GetString("logComment")));
             }
 
+            reader.Close();
+            reader.Dispose();
+
             return items;
 
         }
diff --git a/src/umbraco.businesslogic/User.cs b/src/umbraco.businesslogic/User.cs
index 59b6c19a41..93354d9ee3 100644
--- a/src/umbraco.businesslogic/User.cs
+++ b/src/umbraco.businesslogic/User.cs
@@ -29,13 +29,7 @@ namespace umbraco.BusinessLogic
         
         private readonly Hashtable _notifications = new Hashtable();
         private bool _notificationsInitialized = false;
-
-        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
+        
         internal User(IUser user)
         {
             UserEntity = user;
@@ -304,19 +298,22 @@ namespace umbraco.BusinessLogic
             if (checkForUmbracoConsoleAccess)
                 consoleCheckSql = "and userNoConsole = 0 ";
 
-            object tmp = SqlHelper.ExecuteScalar<object>(
-                "select id from umbracoUser where userDisabled = 0 " + consoleCheckSql + " and userLogin = @login and userPassword = @pw", 
-                SqlHelper.CreateParameter("@login", lname), 
-                SqlHelper.CreateParameter("@pw", passw)
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                object tmp = sqlHelper.ExecuteScalar<object>(
+                    "select id from umbracoUser where userDisabled = 0 " + consoleCheckSql + " and userLogin = @login and userPassword = @pw",
+                    sqlHelper.CreateParameter("@login", lname),
+                    sqlHelper.CreateParameter("@pw", passw)
                 );
 
-            // Logging
-            if (tmp == null)
-            {
-				LogHelper.Info<User>("Login: '" + lname + "' failed, from IP: " + System.Web.HttpContext.Current.Request.UserHostAddress);
+                // Logging
+                if (tmp == null)
+                {
+                    LogHelper.Info<User>("Login: '" + lname + "' failed, from IP: " + System.Web.HttpContext.Current.Request.UserHostAddress);
+                }
+
+                return (tmp != null);
             }
-                
-            return (tmp != null);
         }
 
         /// <summary>
diff --git a/src/umbraco.cms/businesslogic/CMSNode.cs b/src/umbraco.cms/businesslogic/CMSNode.cs
index 632227a3c5..a500f492d6 100644
--- a/src/umbraco.cms/businesslogic/CMSNode.cs
+++ b/src/umbraco.cms/businesslogic/CMSNode.cs
@@ -107,7 +107,8 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static int CountByObjectType(Guid objectType)
         {
-            return SqlHelper.ExecuteScalar<int>("SELECT COUNT(*) from umbracoNode WHERE nodeObjectType = @type", SqlHelper.CreateParameter("@type", objectType));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("SELECT COUNT(*) from umbracoNode WHERE nodeObjectType = @type", sqlHelper.CreateParameter("@type", objectType));
         }
 
         /// <summary>
@@ -119,7 +120,9 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static int CountSubs(int Id)
         {
-            return SqlHelper.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode WHERE ','+path+',' LIKE '%," + Id.ToString() + ",%'");
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode WHERE ','+path+',' LIKE '%,@nodeId,%'", 
+                    sqlHelper.CreateParameter("nodeId", Id));
         }
 
         /// <summary>
@@ -130,9 +133,10 @@ namespace umbraco.cms.businesslogic
         /// <returns></returns>
         public static int CountLeafNodes(int parentId, Guid objectType)
         {
-            return SqlHelper.ExecuteScalar<int>("Select count(uniqueID) from umbracoNode where nodeObjectType = @type And parentId = @parentId",
-                SqlHelper.CreateParameter("@type", objectType),
-                SqlHelper.CreateParameter("@parentId", parentId));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("Select count(uniqueID) from umbracoNode where nodeObjectType = @type And parentId = @parentId",
+	                sqlHelper.CreateParameter("@type", objectType),
+	                sqlHelper.CreateParameter("@parentId", parentId));
         }
 
         /// <summary>
@@ -163,7 +167,8 @@ namespace umbraco.cms.businesslogic
         /// <returns>True if there is a CMSNode with the given Guid</returns>
         public static bool IsNode(Guid uniqueID)
         {
-            return (SqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where uniqueID = @uniqueID", SqlHelper.CreateParameter("@uniqueId", uniqueID)) > 0);
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where uniqueID = @uniqueID", sqlHelper.CreateParameter("@uniqueId", uniqueID)) > 0;
         }
 
         /// <summary>
@@ -173,7 +178,8 @@ namespace umbraco.cms.businesslogic
         /// <returns>True if there is a CMSNode with the given id</returns>
         public static bool IsNode(int Id)
         {
-            return (SqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where id = @id", SqlHelper.CreateParameter("@id", Id)) > 0);
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where id = @id", sqlHelper.CreateParameter("@id", Id)) > 0;
         }
 
         /// <summary>
@@ -185,16 +191,19 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static Guid[] getAllUniquesFromObjectType(Guid objectType)
         {
-            IRecordsReader dr = SqlHelper.ExecuteReader("Select uniqueID from umbracoNode where nodeObjectType = @type",
-                SqlHelper.CreateParameter("@type", objectType));
-            System.Collections.ArrayList tmp = new System.Collections.ArrayList();
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("Select uniqueID from umbracoNode where nodeObjectType = @type",
+                sqlHelper.CreateParameter("@type", objectType)))
+            {
+                System.Collections.ArrayList tmp = new System.Collections.ArrayList();
 
-            while (dr.Read()) tmp.Add(dr.GetGuid("uniqueID"));
-            dr.Close();
+                while (dr.Read()) tmp.Add(dr.GetGuid("uniqueID"));
+                dr.Close();
 
-            Guid[] retval = new Guid[tmp.Count];
-            for (int i = 0; i < tmp.Count; i++) retval[i] = (Guid)tmp[i];
-            return retval;
+                Guid[] retval = new Guid[tmp.Count];
+                for (int i = 0; i < tmp.Count; i++) retval[i] = (Guid)tmp[i];
+                return retval;
+            }
         }
 
         /// <summary>
@@ -206,14 +215,17 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static int[] getAllUniqueNodeIdsFromObjectType(Guid objectType)
         {
-            IRecordsReader dr = SqlHelper.ExecuteReader("Select id from umbracoNode where nodeObjectType = @type",
-                SqlHelper.CreateParameter("@type", objectType));
-            System.Collections.ArrayList tmp = new System.Collections.ArrayList();
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("Select id from umbracoNode where nodeObjectType = @type",
+                sqlHelper.CreateParameter("@type", objectType)))
+            {
+                System.Collections.ArrayList tmp = new System.Collections.ArrayList();
 
-            while (dr.Read()) tmp.Add(dr.GetInt("id"));
-            dr.Close();
+                while (dr.Read()) tmp.Add(dr.GetInt("id"));
+                dr.Close();
 
-            return (int[])tmp.ToArray(typeof(int));
+                return (int[])tmp.ToArray(typeof(int));
+            }
         }
 
 
@@ -226,16 +238,19 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static Guid[] TopMostNodeIds(Guid ObjectType)
         {
-            IRecordsReader dr = SqlHelper.ExecuteReader("Select uniqueID from umbracoNode where nodeObjectType = @type And parentId = -1 order by sortOrder",
-                SqlHelper.CreateParameter("@type", ObjectType));
-            System.Collections.ArrayList tmp = new System.Collections.ArrayList();
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("Select uniqueID from umbracoNode where nodeObjectType = @type And parentId = -1 order by sortOrder", 
+                sqlHelper.CreateParameter("@type", ObjectType)))
+            {
+                System.Collections.ArrayList tmp = new System.Collections.ArrayList();
 
-            while (dr.Read()) tmp.Add(dr.GetGuid("uniqueID"));
-            dr.Close();
+                while (dr.Read()) tmp.Add(dr.GetGuid("uniqueID"));
+                dr.Close();
 
-            Guid[] retval = new Guid[tmp.Count];
-            for (int i = 0; i < tmp.Count; i++) retval[i] = (Guid)tmp[i];
-            return retval;
+                Guid[] retval = new Guid[tmp.Count];
+                for (int i = 0; i < tmp.Count; i++) retval[i] = (Guid)tmp[i];
+                return retval;
+            }
         }
 
         #endregion
@@ -272,18 +287,18 @@ namespace umbraco.cms.businesslogic
             // Ruben 8/1/2007: I replace this with a parameterized version.
             // But does anyone know what the 'level++' is supposed to be doing there?
             // Nothing obviously, since it's a postfix.
-
-            SqlHelper.ExecuteNonQuery("INSERT INTO umbracoNode(trashed, parentID, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text, createDate) VALUES(@trashed, @parentID, @nodeObjectType, @nodeUser, @level, @path, @sortOrder, @uniqueID, @text, @createDate)",
-                                      SqlHelper.CreateParameter("@trashed", 0),
-                                      SqlHelper.CreateParameter("@parentID", parentId),
-                                      SqlHelper.CreateParameter("@nodeObjectType", objectType),
-                                      SqlHelper.CreateParameter("@nodeUser", userId),
-                                      SqlHelper.CreateParameter("@level", level++),
-                                      SqlHelper.CreateParameter("@path", path),
-                                      SqlHelper.CreateParameter("@sortOrder", sortOrder),
-                                      SqlHelper.CreateParameter("@uniqueID", uniqueID),
-                                      SqlHelper.CreateParameter("@text", text),
-                                      SqlHelper.CreateParameter("@createDate", DateTime.Now));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("INSERT INTO umbracoNode(trashed, parentID, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text, createDate) VALUES(@trashed, @parentID, @nodeObjectType, @nodeUser, @level, @path, @sortOrder, @uniqueID, @text, @createDate)",
+                                        sqlHelper.CreateParameter("@trashed", 0),
+                                        sqlHelper.CreateParameter("@parentID", parentId),
+                                        sqlHelper.CreateParameter("@nodeObjectType", objectType),
+                                        sqlHelper.CreateParameter("@nodeUser", userId),
+                                        sqlHelper.CreateParameter("@level", level++),
+                                        sqlHelper.CreateParameter("@path", path),
+                                        sqlHelper.CreateParameter("@sortOrder", sortOrder),
+                                        sqlHelper.CreateParameter("@uniqueID", uniqueID),
+                                        sqlHelper.CreateParameter("@text", text),
+                                        sqlHelper.CreateParameter("@createDate", DateTime.Now));
 
             CMSNode retVal = new CMSNode(uniqueID);
             retVal.Path = path + "," + retVal.Id.ToString();
@@ -309,11 +324,12 @@ namespace umbraco.cms.businesslogic
         private static int GetNewDocumentSortOrder(int parentId)
         {
             var sortOrder = 0;
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(
-                        "SELECT MAX(sortOrder) AS sortOrder FROM umbracoNode WHERE parentID = @parentID AND nodeObjectType = @GuidForNodesOfTypeDocument",
-                        SqlHelper.CreateParameter("@parentID", parentId),
-                        SqlHelper.CreateParameter("@GuidForNodesOfTypeDocument", Document._objectType)
-                  ))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(
+                    "SELECT MAX(sortOrder) AS sortOrder FROM umbracoNode WHERE parentID = @parentID AND nodeObjectType = @GuidForNodesOfTypeDocument",
+                    sqlHelper.CreateParameter("@parentID", parentId),
+                    sqlHelper.CreateParameter("@GuidForNodesOfTypeDocument", Document._objectType)
+                ))
             {
                 while (dr.Read())
                     sortOrder = dr.GetInt("sortOrder") + 1;
@@ -332,19 +348,18 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         protected static int[] getUniquesFromObjectTypeAndFirstLetter(Guid objectType, char letter)
         {
-            using (IRecordsReader dr = SqlHelper.ExecuteReader("Select id from umbracoNode where nodeObjectType = @objectType AND text like @letter", SqlHelper.CreateParameter("@objectType", objectType), SqlHelper.CreateParameter("@letter", letter.ToString() + "%")))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("Select id from umbracoNode where nodeObjectType = @objectType AND text like @letter", sqlHelper.CreateParameter("@objectType", objectType), sqlHelper.CreateParameter("@letter", letter.ToString() + "%")))
             {
                 List<int> tmp = new List<int>();
                 while (dr.Read()) tmp.Add(dr.GetInt("id"));
                 return tmp.ToArray();
             }
         }
-
-
+        
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
@@ -410,13 +425,15 @@ namespace umbraco.cms.businesslogic
         /// <param name="uniqueID">The unique ID.</param>
         public CMSNode(Guid uniqueID)
         {
-            _id = SqlHelper.ExecuteScalar<int>("SELECT id FROM umbracoNode WHERE uniqueID = @uniqueId", SqlHelper.CreateParameter("@uniqueId", uniqueID));
+            using (var sqlHelper = Application.SqlHelper)
+                _id = sqlHelper.ExecuteScalar<int>("SELECT id FROM umbracoNode WHERE uniqueID = @uniqueId", sqlHelper.CreateParameter("@uniqueId", uniqueID));
             setupNode();
         }
 
         public CMSNode(Guid uniqueID, bool noSetup)
         {
-            _id = SqlHelper.ExecuteScalar<int>("SELECT id FROM umbracoNode WHERE uniqueID = @uniqueId", SqlHelper.CreateParameter("@uniqueId", uniqueID));
+            using (var sqlHelper = Application.SqlHelper)
+                _id = sqlHelper.ExecuteScalar<int>("SELECT id FROM umbracoNode WHERE uniqueID = @uniqueId", sqlHelper.CreateParameter("@uniqueId", uniqueID));
 
             if (!noSetup)
                 setupNode();
@@ -500,14 +517,17 @@ inner join cmsPreviewXml on cmsPreviewXml.nodeId = umbracoNode.id
 where trashed = 0 and path like '{0}' 
 order by level,sortOrder";
 
-            string pathExp = childrenOnly ? Path + ",%" : Path;
+            var pathExp = childrenOnly ? Path + ",%" : Path;
 
-            IRecordsReader dr = SqlHelper.ExecuteReader(String.Format(sql, pathExp));
-            while (dr.Read())
-                nodes.Add(new CMSPreviewNode(dr.GetInt("id"), dr.GetGuid("uniqueID"), dr.GetInt("parentId"), dr.GetShort("level"), dr.GetInt("sortOrder"), dr.GetString("xml"), false));
-            dr.Close();
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(string.Format(sql, pathExp)))
+            {
+                while (dr.Read())
+                    nodes.Add(new CMSPreviewNode(dr.GetInt("id"), dr.GetGuid("uniqueID"), dr.GetInt("parentId"), dr.GetShort("level"), dr.GetInt("sortOrder"), dr.GetString("xml"), false));
+                dr.Close();
 
-            return nodes;
+                return nodes;
+            }
         }
 
         /// <summary>
@@ -552,11 +572,13 @@ order by level,sortOrder";
                 //level and path might change even if it's the same newParent because the newParent could be moving somewhere.
                 if (ParentId != newParent.Id)
                 {
-                    int maxSortOrder = SqlHelper.ExecuteScalar<int>("select coalesce(max(sortOrder),0) from umbracoNode where parentid = @parentId",
-                        SqlHelper.CreateParameter("@parentId", newParent.Id));
-
-                    this.Parent = newParent;
-                    this.sortOrder = maxSortOrder + 1;
+                    using (var sqlHelper = Application.SqlHelper)
+                    {
+                        int maxSortOrder = sqlHelper.ExecuteScalar<int>("select coalesce(max(sortOrder),0) from umbracoNode where parentid = @parentId",
+                                sqlHelper.CreateParameter("@parentId", newParent.Id));
+                        this.Parent = newParent;
+                        this.sortOrder = maxSortOrder + 1;
+                    }
                 }
 
                 //detect if we have moved, then update the level and path
@@ -654,8 +676,8 @@ order by level,sortOrder";
 
                 //removes tag associations (i know the key is set to cascade but do it anyways)
                 Tag.RemoveTagsFromNode(this.Id);
-
-                SqlHelper.ExecuteNonQuery("DELETE FROM umbracoNode WHERE uniqueID= @uniqueId", SqlHelper.CreateParameter("@uniqueId", _uniqueID));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("DELETE FROM umbracoNode WHERE uniqueID= @uniqueId", sqlHelper.CreateParameter("@uniqueId", _uniqueID));
                 FireAfterDelete(e);
             }
         }
@@ -672,9 +694,12 @@ order by level,sortOrder";
             {
                 if (!_hasChildrenInitialized)
                 {
-                    int tmpChildrenCount = SqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where ParentId = @id",
-                        SqlHelper.CreateParameter("@id", Id));
-                    HasChildren = (tmpChildrenCount > 0);
+                    using (var sqlHelper = Application.SqlHelper)
+                    {
+                        int tmpChildrenCount = sqlHelper.ExecuteScalar<int>("select count(id) from umbracoNode where ParentId = @id",
+                                sqlHelper.CreateParameter("@id", Id));
+                        HasChildren = (tmpChildrenCount > 0);
+                    }
                 }
                 return _hasChildren;
             }
@@ -696,7 +721,8 @@ order by level,sortOrder";
         public virtual IEnumerable GetDescendants()
         {
             var descendants = new List<CMSNode>();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(string.Format(SqlDescendants, Id)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(string.Format(SqlDescendants, Id)))
             {
                 while (dr.Read())
                 {
@@ -722,17 +748,21 @@ order by level,sortOrder";
             {
                 if (!_isTrashed.HasValue)
                 {
-                    _isTrashed = Convert.ToBoolean(SqlHelper.ExecuteScalar<object>("SELECT trashed FROM umbracoNode where id=@id",
-                        SqlHelper.CreateParameter("@id", this.Id)));
+                    using (var sqlHelper = Application.SqlHelper)
+                    {
+                        const string query = "SELECT trashed FROM umbracoNode where id=@id";
+                        _isTrashed = Convert.ToBoolean(sqlHelper.ExecuteScalar<object>(query, sqlHelper.CreateParameter("@id", this.Id)));
+                    }
                 }
                 return _isTrashed.Value;
             }
             set
             {
                 _isTrashed = value;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set trashed = @trashed where id = @id",
-                    SqlHelper.CreateParameter("@trashed", value),
-                    SqlHelper.CreateParameter("@id", this.Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set trashed = @trashed where id = @id",
+                    sqlHelper.CreateParameter("@trashed", value),
+                    sqlHelper.CreateParameter("@id", this.Id));
             }
         }
 
@@ -746,7 +776,8 @@ order by level,sortOrder";
             set
             {
                 _sortOrder = value;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set sortOrder = '" + value + "' where id = " + this.Id.ToString());
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set sortOrder = '" + value + "' where id = " + this.Id);
 
                 if (Entity != null)
                     Entity.SortOrder = value;
@@ -763,7 +794,8 @@ order by level,sortOrder";
             set
             {
                 _createDate = value;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set createDate = @createDate where id = " + this.Id.ToString(), SqlHelper.CreateParameter("@createDate", _createDate));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set createDate = @createDate where id = " + this.Id, sqlHelper.CreateParameter("@createDate", _createDate));
             }
         }
 
@@ -816,7 +848,8 @@ order by level,sortOrder";
             set
             {
                 _parentid = value.Id;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set parentId = " + value.Id + " where id = " + this.Id.ToString());
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set parentId = " + value.Id + " where id = " + this.Id.ToString());
 
                 if (Entity != null)
                     Entity.ParentId = value.Id;
@@ -836,7 +869,8 @@ order by level,sortOrder";
             set
             {
                 _path = value;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set path = '" + _path + "' where id = " + this.Id.ToString());
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set path = '" + _path + "' where id = " + this.Id.ToString());
 
                 if (Entity != null)
                     Entity.Path = value;
@@ -854,7 +888,8 @@ order by level,sortOrder";
             set
             {
                 _level = value;
-                SqlHelper.ExecuteNonQuery("update umbracoNode set level = " + _level.ToString() + " where id = " + this.Id.ToString());
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update umbracoNode set level = " + _level.ToString() + " where id = " + this.Id.ToString());
 
                 if (Entity != null)
                     Entity.Level = value;
@@ -893,8 +928,9 @@ order by level,sortOrder";
         {
             get
             {
-                return SqlHelper.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode where ParentID = @parentId",
-                                                    SqlHelper.CreateParameter("@parentId", this.Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    return sqlHelper.ExecuteScalar<int>("SELECT COUNT(*) FROM umbracoNode where ParentID = @parentId",
+                                                    sqlHelper.CreateParameter("@parentId", this.Id));
             }
         }
 
@@ -907,9 +943,10 @@ order by level,sortOrder";
             get
             {
                 System.Collections.ArrayList tmp = new System.Collections.ArrayList();
-                using (IRecordsReader dr = SqlHelper.ExecuteReader("SELECT id, createDate, trashed, parentId, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text FROM umbracoNode WHERE ParentID = @ParentID AND nodeObjectType = @type order by sortOrder",
-                    SqlHelper.CreateParameter("@type", this.nodeObjectType),
-                    SqlHelper.CreateParameter("ParentID", this.Id)))
+                using (var sqlHelper = Application.SqlHelper)
+                using (IRecordsReader dr = sqlHelper.ExecuteReader("SELECT id, createDate, trashed, parentId, nodeObjectType, nodeUser, level, path, sortOrder, uniqueID, text FROM umbracoNode WHERE ParentID = @ParentID AND nodeObjectType = @type order by sortOrder",
+                    sqlHelper.CreateParameter("@type", this.nodeObjectType),
+                    sqlHelper.CreateParameter("ParentID", this.Id)))
                 {
                     while (dr.Read())
                     {
@@ -937,12 +974,12 @@ order by level,sortOrder";
             get
             {
                 System.Collections.ArrayList tmp = new System.Collections.ArrayList();
-                IRecordsReader dr = SqlHelper.ExecuteReader("select id from umbracoNode where ParentID = " + this.Id + " order by sortOrder");
-
-                while (dr.Read())
-                    tmp.Add(dr.GetInt("Id"));
-
-                dr.Close();
+                using (var sqlHelper = Application.SqlHelper)
+                using (IRecordsReader dr = sqlHelper.ExecuteReader("select id from umbracoNode where ParentID = " + this.Id + " order by sortOrder"))
+                {
+                    while (dr.Read())
+                        tmp.Add(dr.GetInt("Id"));
+                }
 
                 CMSNode[] retval = new CMSNode[tmp.Count];
 
@@ -952,7 +989,7 @@ order by level,sortOrder";
                 return retval;
             }
         }
-
+        
         #region IconI members
 
         // Unique identifier of the given node
@@ -973,9 +1010,10 @@ order by level,sortOrder";
             set
             {
                 _text = value;
-                SqlHelper.ExecuteNonQuery("UPDATE umbracoNode SET text = @text WHERE id = @id",
-                                          SqlHelper.CreateParameter("@text", value.Trim()),
-                                          SqlHelper.CreateParameter("@id", this.Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("UPDATE umbracoNode SET text = @text WHERE id = @id",
+                                          sqlHelper.CreateParameter("@text", value.Trim()),
+                                          sqlHelper.CreateParameter("@id", this.Id));
 
                 if (Entity != null)
                     Entity.Name = value;
@@ -1052,8 +1090,9 @@ order by level,sortOrder";
         /// </summary>
         protected virtual void setupNode()
         {
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(SqlSingle,
-                    SqlHelper.CreateParameter("@id", this.Id)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(SqlSingle, 
+                sqlHelper.CreateParameter("@id", this.Id)))
             {
                 if (dr.Read())
                 {
@@ -1105,10 +1144,11 @@ order by level,sortOrder";
         {
 
             XmlDocument xmlDoc = new XmlDocument();
-            using (XmlReader xmlRdr = SqlHelper.ExecuteXmlReader(
+            using (var sqlHelper = Application.SqlHelper)
+            using (XmlReader xmlRdr = sqlHelper.ExecuteXmlReader(
                                                        "select xml from cmsPreviewXml where nodeID = @nodeId and versionId = @versionId",
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@versionId", version)))
+                                      sqlHelper.CreateParameter("@nodeId", Id),
+                                      sqlHelper.CreateParameter("@versionId", version)))
             {
                 xmlDoc.Load(xmlRdr);
             }
@@ -1118,8 +1158,9 @@ order by level,sortOrder";
 
         protected internal virtual bool PreviewExists(Guid versionId)
         {
-            return (SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsPreviewXml WHERE nodeId=@nodeId and versionId = @versionId",
-                        SqlHelper.CreateParameter("@nodeId", Id), SqlHelper.CreateParameter("@versionId", versionId)) != 0);
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsPreviewXml WHERE nodeId=@nodeId and versionId = @versionId",
+                           sqlHelper.CreateParameter("@nodeId", Id), sqlHelper.CreateParameter("@versionId", versionId)) != 0;
 
         }
 
@@ -1131,13 +1172,15 @@ order by level,sortOrder";
         [MethodImpl(MethodImplOptions.Synchronized)]
         protected void SavePreviewXml(XmlNode x, Guid versionId)
         {
-            string sql = PreviewExists(versionId) ? "UPDATE cmsPreviewXml SET xml = @xml, timestamp = @timestamp WHERE nodeId=@nodeId AND versionId = @versionId"
+            var sql = PreviewExists(versionId) ? "UPDATE cmsPreviewXml SET xml = @xml, timestamp = @timestamp WHERE nodeId=@nodeId AND versionId = @versionId"
                                 : "INSERT INTO cmsPreviewXml(nodeId, versionId, timestamp, xml) VALUES (@nodeId, @versionId, @timestamp, @xml)";
-            SqlHelper.ExecuteNonQuery(sql,
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@versionId", versionId),
-                                      SqlHelper.CreateParameter("@timestamp", DateTime.Now),
-                                      SqlHelper.CreateParameter("@xml", x.OuterXml));
+
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(sql,
+                                      sqlHelper.CreateParameter("@nodeId", Id),
+                                      sqlHelper.CreateParameter("@versionId", versionId),
+                                      sqlHelper.CreateParameter("@timestamp", DateTime.Now),
+                                      sqlHelper.CreateParameter("@xml", x.OuterXml));
         }
 
         protected void PopulateCMSNodeFromReader(IRecordsReader dr)
diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs
index f014ddae93..abdaa1102e 100644
--- a/src/umbraco.cms/businesslogic/Content.cs
+++ b/src/umbraco.cms/businesslogic/Content.cs
@@ -11,6 +11,7 @@ using Umbraco.Core.Models.EntityBase;
 using umbraco.cms.businesslogic.property;
 using umbraco.DataLayer;
 using System.Runtime.CompilerServices;
+using umbraco.BusinessLogic;
 using umbraco.cms.helpers;
 using umbraco.cms.businesslogic.datatype.controls;
 using File = System.IO.File;
@@ -55,7 +56,7 @@ namespace umbraco.cms.businesslogic
         public Content(int id) : base(id) { }
 
         protected Content(int id, bool noSetup) : base(id, noSetup) { }
-       
+
         protected Content(Guid id) : base(id) { }
 
         protected Content(Guid id, bool noSetup) : base(id, noSetup) { }
@@ -130,23 +131,27 @@ namespace umbraco.cms.businesslogic
         {
             get
             {
-                if (_contentType == null)
+                using (var sqlHelper = Application.SqlHelper)
                 {
-                    object o = SqlHelper.ExecuteScalar<object>(
-                        "Select ContentType from cmsContent where nodeId=@nodeid",
-                            SqlHelper.CreateParameter("@nodeid", this.Id));
-                    if (o == null)
-                        return null;
-                    int contentTypeId;
-                    if (int.TryParse(o.ToString(), out contentTypeId) == false)
-                        return null;
-                    try
+                    if (_contentType == null)
                     {
-                        _contentType = new ContentType(contentTypeId);
-                    }
-                    catch
-                    {
-                        return null;
+                        object o = sqlHelper.ExecuteScalar<object>(
+                            "Select ContentType from cmsContent where nodeId=@nodeid",
+                            sqlHelper.CreateParameter("@nodeid", this.Id));
+                        if (o == null)
+                            return null;
+                        int contentTypeId;
+                        if (int.TryParse(o.ToString(), out contentTypeId) == false)
+                            return null;
+
+                        try
+                        {
+                            _contentType = new ContentType(contentTypeId);
+                        }
+                        catch
+                        {
+                            return null;
+                        }
                     }
                 }
                 return _contentType;
@@ -196,27 +201,34 @@ namespace umbraco.cms.businesslogic
                     if (this is media.Media)
                     {
                         // get the xml fragment from cmsXmlContent
-                        string xmlFragment = SqlHelper.ExecuteScalar<string>(@"SELECT [xml] FROM cmsContentXml WHERE nodeId = " + this.Id);
-                        if (!string.IsNullOrWhiteSpace(xmlFragment))
+                        using (var sqlHelper = Application.SqlHelper)
                         {
-                            XmlDocument xmlDocument = new XmlDocument();
-                            xmlDocument.LoadXml(xmlFragment);                            
+                            string xmlFragment = sqlHelper.ExecuteScalar<string>(@"SELECT [xml] FROM cmsContentXml WHERE nodeId = " + this.Id);
+                            if (!string.IsNullOrWhiteSpace(xmlFragment))
+                            {
+                                XmlDocument xmlDocument = new XmlDocument();
+                                xmlDocument.LoadXml(xmlFragment);
 
-                            _versionDateInitialized = DateTime.TryParse(xmlDocument.SelectSingleNode("//*[1]").Attributes["updateDate"].Value, out _versionDate);
+                                _versionDateInitialized = DateTime.TryParse(xmlDocument.SelectSingleNode("//*[1]").Attributes["updateDate"].Value, out _versionDate);
+                            }
                         }
                     }
 
                     if (!_versionDateInitialized)
                     {
-                        object o = SqlHelper.ExecuteScalar<object>(
-                            "select VersionDate from cmsContentVersion where versionId = '" + this.Version.ToString() + "'");
-                        if (o == null)
+
+                        using (var sqlHelper = Application.SqlHelper)
                         {
-                            _versionDate = DateTime.Now;
-                        }
-                        else
-                        {
-                            _versionDateInitialized = DateTime.TryParse(o.ToString(), out _versionDate);
+                            object o = sqlHelper.ExecuteScalar<object>(
+                                "select VersionDate from cmsContentVersion where versionId = '" + this.Version.ToString() + "'");
+                            if (o == null)
+                            {
+                                _versionDate = DateTime.Now;
+                            }
+                            else
+                            {
+                                _versionDateInitialized = DateTime.TryParse(o.ToString(), out _versionDate);
+                            }
                         }
                     }
                 }
@@ -266,7 +278,8 @@ namespace umbraco.cms.businesslogic
                     string sql = "Select versionId from cmsContentVersion where contentID = " + this.Id +
                                  " order by id desc ";
 
-                    using (IRecordsReader dr = SqlHelper.ExecuteReader(sql))
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (IRecordsReader dr = sqlHelper.ExecuteReader(sql))
                     {
                         if (!dr.Read())
                             _version = Guid.Empty;
@@ -287,7 +300,7 @@ namespace umbraco.cms.businesslogic
         /// Used to persist object changes to the database. This ensures that the properties are re-loaded from the database.
         /// </summary>
         public override void Save()
-        {            
+        {
             base.Save();
 
             ClearLoadedProperties();
@@ -326,7 +339,7 @@ namespace umbraco.cms.businesslogic
         public virtual Property addProperty(PropertyType pt, Guid versionId)
         {
             ClearLoadedProperties();
-            
+
             return property.Property.MakeNew(pt, this, versionId);
 
         }
@@ -346,13 +359,15 @@ namespace umbraco.cms.businesslogic
                 // after the empty catch we'll generate the xml which is why we don't do anything in the catch part
                 try
                 {
-                    XmlReader xr = SqlHelper.ExecuteXmlReader("select xml from cmsContentXml where nodeID = " + this.Id.ToString());
-                    if (xr.MoveToContent() != System.Xml.XmlNodeType.None)
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var xr = sqlHelper.ExecuteXmlReader("select xml from cmsContentXml where nodeID = " + this.Id.ToString()))
                     {
-                        xmlDoc.Load(xr);
-                        _xml = xmlDoc.FirstChild;
+                        if (xr.MoveToContent() != System.Xml.XmlNodeType.None)
+                        {
+                            xmlDoc.Load(xr);
+                            _xml = xmlDoc.FirstChild;
+                        }
                     }
-                    xr.Close();
                 }
                 catch
                 {
@@ -395,7 +410,8 @@ namespace umbraco.cms.businesslogic
         /// </summary>
         public virtual void XmlRemoveFromDB()
         {
-            SqlHelper.ExecuteNonQuery("delete from cmsContentXml where nodeId = @nodeId", SqlHelper.CreateParameter("@nodeId", this.Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsContentXml where nodeId = @nodeId", sqlHelper.CreateParameter("@nodeId", this.Id));
         }
 
         /// <summary>
@@ -458,16 +474,20 @@ namespace umbraco.cms.businesslogic
             this.deleteAllProperties();
 
             // Remove all content preview xml
-            SqlHelper.ExecuteNonQuery("delete from cmsPreviewXml where nodeId = " + Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsPreviewXml where nodeId = " + Id);
 
             // Delete version history
-            SqlHelper.ExecuteNonQuery("Delete from cmsContentVersion where ContentId = " + this.Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsContentVersion where ContentId = " + this.Id);
 
             // Delete xml
-            SqlHelper.ExecuteNonQuery("delete from cmsContentXml where nodeID = @nodeId", SqlHelper.CreateParameter("@nodeId", this.Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsContentXml where nodeID = @nodeId", sqlHelper.CreateParameter("@nodeId", this.Id));
 
             // Delete Contentspecific data ()
-            SqlHelper.ExecuteNonQuery("Delete from cmsContent where NodeId = " + this.Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsContent where NodeId = " + this.Id);
 
             // Delete Nodeinformation!!
             base.delete();
@@ -486,7 +506,7 @@ namespace umbraco.cms.businesslogic
         {
             //we know that there is one ctor arg and it is a GUID since we are only calling the base
             // ctor with this overload for one purpose.
-            var version = (Guid) ctorArgs[0];
+            var version = (Guid)ctorArgs[0];
             _version = version;
 
             base.PreSetupNode(ctorArgs);
@@ -518,20 +538,21 @@ namespace umbraco.cms.businesslogic
         /// <param name="ct"></param>
         protected virtual void CreateContent(ContentType ct)
         {
-            SqlHelper.ExecuteNonQuery("insert into cmsContent (nodeId,ContentType) values (" + this.Id + "," + ct.Id + ")");
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("insert into cmsContent (nodeId,ContentType) values (" + this.Id + "," + ct.Id + ")");
             createNewVersion(DateTime.Now);
         }
-        
+
         /// <summary>
         /// Method for creating a new version of the data associated to the Content. 
         /// </summary>
         /// <returns>The new version Id</returns>
-		protected Guid createNewVersion(DateTime versionDate = default(DateTime))
+        protected Guid createNewVersion(DateTime versionDate = default(DateTime))
         {
-			if (versionDate == default (DateTime))
-			{
-				versionDate = DateTime.Now;
-			}
+            if (versionDate == default(DateTime))
+            {
+                versionDate = DateTime.Now;
+            }
 
             ClearLoadedProperties();
 
@@ -539,8 +560,9 @@ namespace umbraco.cms.businesslogic
             bool tempHasVersion = hasVersion();
 
             // we need to ensure that a version in the db exist before we add related data
-            SqlHelper.ExecuteNonQuery("Insert into cmsContentVersion (ContentId,versionId,versionDate) values (" + this.Id + ",'" + newVersion + "', @updateDate)",
-                SqlHelper.CreateParameter("@updateDate", versionDate));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Insert into cmsContentVersion (ContentId,versionId,versionDate) values (" + this.Id + ",'" + newVersion + "', @updateDate)",
+                sqlHelper.CreateParameter("@updateDate", versionDate));
 
             List<PropertyType> pts = ContentType.PropertyTypes;
             foreach (propertytype.PropertyType pt in pts)
@@ -577,16 +599,20 @@ namespace umbraco.cms.businesslogic
         protected virtual void SaveXmlDocument(XmlNode node)
         {
             // Method is synchronized so exists remains consistent (avoiding race condition)
-            bool exists = SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId = @nodeId",
-                                           SqlHelper.CreateParameter("@nodeId", Id)) > 0;
-            string query;
-            if (exists)
-                query = "UPDATE cmsContentXml SET xml = @xml WHERE nodeId = @nodeId";
-            else
-                query = "INSERT INTO cmsContentXml(nodeId, xml) VALUES (@nodeId, @xml)";
-            SqlHelper.ExecuteNonQuery(query,
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@xml", node.OuterXml));
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                bool exists = sqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId = @nodeId",
+                                           sqlHelper.CreateParameter("@nodeId", Id)) > 0;
+                string query;
+                if (exists)
+                    query = "UPDATE cmsContentXml SET xml = @xml WHERE nodeId = @nodeId";
+                else
+                    query = "INSERT INTO cmsContentXml(nodeId, xml) VALUES (@nodeId, @xml)";
+            
+                sqlHelper.ExecuteNonQuery(query,
+                                      sqlHelper.CreateParameter("@nodeId", Id),
+                                      sqlHelper.CreateParameter("@xml", node.OuterXml));
+            }
         }
 
         /// <summary>
@@ -599,9 +625,9 @@ namespace umbraco.cms.businesslogic
 
             var fs = FileSystemProviderManager.Current.GetFileSystemProvider<MediaFileSystem>();
             var uploadField = DataTypesResolver.Current.GetById(new Guid(Constants.PropertyEditors.UploadField));
-             
+
             foreach (Property p in GenericProperties)
-            {               
+            {
                 var isUploadField = false;
                 try
                 {
@@ -692,8 +718,9 @@ namespace umbraco.cms.businesslogic
 
             string sql = @"select id, propertyTypeId from cmsPropertyData where versionId=@versionId";
 
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(sql,
-                SqlHelper.CreateParameter("@versionId", Version)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(sql,
+                sqlHelper.CreateParameter("@versionId", Version)))
             {
                 while (dr.Read())
                 {
@@ -736,13 +763,16 @@ namespace umbraco.cms.businesslogic
         /// </summary>
         protected void deleteAllProperties()
         {
-            SqlHelper.ExecuteNonQuery("Delete from cmsPropertyData where contentNodeId = @nodeId", SqlHelper.CreateParameter("@nodeId", this.Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsPropertyData where contentNodeId = @nodeId", sqlHelper.CreateParameter("@nodeId", this.Id));
         }
 
         private XmlNode importXml()
         {
             XmlDocument xmlDoc = new XmlDocument();
-            xmlDoc.Load(SqlHelper.ExecuteXmlReader("select xml from cmsContentXml where nodeID = " + this.Id.ToString()));
+            using (var sqlHelper = Application.SqlHelper)
+            using (var doc = sqlHelper.ExecuteXmlReader("select xml from cmsContentXml where nodeID = " + this.Id.ToString()))
+                xmlDoc.Load(doc);
 
             return xmlDoc.FirstChild;
         }
@@ -753,8 +783,11 @@ namespace umbraco.cms.businesslogic
         /// <returns>Returns true if the Content has a version</returns>
         private bool hasVersion()
         {
-            int versionCount = SqlHelper.ExecuteScalar<int>("select Count(Id) as tmp from cmsContentVersion where contentId = " + this.Id.ToString());
-            return (versionCount > 0);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                int versionCount = sqlHelper.ExecuteScalar<int>("select Count(Id) as tmp from cmsContentVersion where contentId = " + this.Id.ToString());
+                return (versionCount > 0);
+            }
         }
 
         #endregion
@@ -774,7 +807,6 @@ namespace umbraco.cms.businesslogic
         {
             SavePreviewXml(generateXmlWithoutSaving(xd), Version);
         }
-
         #endregion
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/ContentType.cs b/src/umbraco.cms/businesslogic/ContentType.cs
index b9b15ce595..7f1f3db742 100644
--- a/src/umbraco.cms/businesslogic/ContentType.cs
+++ b/src/umbraco.cms/businesslogic/ContentType.cs
@@ -5,6 +5,7 @@ using System.Threading;
 using System.Runtime.CompilerServices;
 using System.Linq;
 using System.Xml;
+using umbraco.BusinessLogic;
 using Umbraco.Core;
 using Umbraco.Core.Cache;
 using Umbraco.Core.Logging;
@@ -206,7 +207,8 @@ namespace umbraco.cms.businesslogic
 
         internal static void Create(int nodeId, string alias, string iconUrl, bool formatAlias)
         {
-            SqlHelper.ExecuteNonQuery(
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(
                                       "Insert into cmsContentType (nodeId,alias,icon) values (" + 
                                       nodeId + ",'" +
                                       (formatAlias ? helpers.Casing.SafeAliasWithForcingCheck(alias) : alias) +
@@ -222,8 +224,9 @@ namespace umbraco.cms.businesslogic
         /// </returns>
         public static ContentType GetByAlias(string Alias)
         {
-            return new ContentType(SqlHelper.ExecuteScalar<int>("SELECT nodeid FROM cmsContentType WHERE alias = @alias",
-                                   SqlHelper.CreateParameter("@alias", Alias)));
+            using (var sqlHelper = Application.SqlHelper)
+                return new ContentType(sqlHelper.ExecuteScalar<int>("SELECT nodeid FROM cmsContentType WHERE alias = @alias",
+                                   sqlHelper.CreateParameter("@alias", Alias)));
         }
 
         /// <summary>
@@ -233,10 +236,13 @@ namespace umbraco.cms.businesslogic
         /// <returns>The Id of the Tab on which the PropertyType is placed</returns>
         public static int getTabIdFromPropertyType(PropertyType pt)
         {
-            object tmp = SqlHelper.ExecuteScalar<object>("Select propertyTypeGroupId from cmsPropertyType where id = " + pt.Id.ToString());
-            if (tmp == DBNull.Value)
-                return 0;
-            return int.Parse(tmp.ToString());
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                object tmp = sqlHelper.ExecuteScalar<object>("Select propertyTypeGroupId from cmsPropertyType where id = " + pt.Id.ToString());
+                if (tmp == DBNull.Value)
+                    return 0;
+                return int.Parse(tmp.ToString());
+            }
         }
 
         #endregion
@@ -292,16 +298,16 @@ namespace umbraco.cms.businesslogic
         {
             var ids = new List<int>();
             //get all the content item ids of the current content type
-            using (var dr = SqlHelper.ExecuteReader(@"SELECT DISTINCT cmsContent.nodeId FROM cmsContent 
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(@"SELECT DISTINCT cmsContent.nodeId FROM cmsContent 
                                                 INNER JOIN cmsContentType ON cmsContent.contentType = cmsContentType.nodeId 
                                                 WHERE cmsContentType.nodeId = @nodeId",
-                                                    SqlHelper.CreateParameter("@nodeId", this.Id)))
+                                                    sqlHelper.CreateParameter("@nodeId", this.Id)))
             {
                 while (dr.Read())
                 {
                     ids.Add(dr.GetInt("nodeId"));
                 }
-                dr.Close();
             }
             return ids;
         }
@@ -332,11 +338,12 @@ namespace umbraco.cms.businesslogic
         internal virtual void ClearXmlStructuresForContent()
         {
             //Remove all items from the cmsContentXml table that are of this current content type
-            SqlHelper.ExecuteNonQuery(@"DELETE FROM cmsContentXml WHERE nodeId IN
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(@"DELETE FROM cmsContentXml WHERE nodeId IN
                                         (SELECT DISTINCT cmsContent.nodeId FROM cmsContent 
                                             INNER JOIN cmsContentType ON cmsContent.contentType = cmsContentType.nodeId 
                                             WHERE cmsContentType.nodeId = @nodeId)",
-                                      SqlHelper.CreateParameter("@nodeId", this.Id));
+                                      sqlHelper.CreateParameter("@nodeId", this.Id));
         }
 
         #endregion
@@ -362,9 +369,10 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery("update cmsContentType set alias = @alias where nodeId = @id",
-                                              SqlHelper.CreateParameter("@alias", _alias),
-                                              SqlHelper.CreateParameter("@id", Id));
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery("update cmsContentType set alias = @alias where nodeId = @id",
+                                              sqlHelper.CreateParameter("@alias", _alias),
+                                              sqlHelper.CreateParameter("@id", Id));
                 }
                 else
                 {
@@ -391,7 +399,8 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery("update cmsContentType set icon='" + value + "' where nodeid = " + Id);
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery("update cmsContentType set icon='" + value + "' where nodeid = " + Id);
                 }
                 else
                 {
@@ -418,10 +427,11 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                                           "update cmsContentType set isContainer = @isContainer where nodeId = @id",
-                                          SqlHelper.CreateParameter("@isContainer", value),
-                                          SqlHelper.CreateParameter("@id", Id));
+                                          sqlHelper.CreateParameter("@isContainer", value),
+                                          sqlHelper.CreateParameter("@id", Id));
                 }
                 else
                 {
@@ -444,10 +454,11 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                                           "update cmsContentType set allowAtRoot = @allowAtRoot where nodeId = @id",
-                                          SqlHelper.CreateParameter("@allowAtRoot", value),
-                                          SqlHelper.CreateParameter("@id", Id));
+                                          sqlHelper.CreateParameter("@allowAtRoot", value),
+                                          sqlHelper.CreateParameter("@id", Id));
                 }
                 else
                 {
@@ -492,10 +503,11 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                                           "update cmsContentType set description = @description where nodeId = @id",
-                                          SqlHelper.CreateParameter("@description", value),
-                                          SqlHelper.CreateParameter("@id", Id));
+                                          sqlHelper.CreateParameter("@description", value),
+                                          sqlHelper.CreateParameter("@id", Id));
                 }
                 else
                 {
@@ -521,10 +533,11 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                                           "update cmsContentType set thumbnail = @thumbnail where nodeId = @id",
-                                          SqlHelper.CreateParameter("@thumbnail", value),
-                                          SqlHelper.CreateParameter("@id", Id));
+                                          sqlHelper.CreateParameter("@thumbnail", value),
+                                          sqlHelper.CreateParameter("@id", Id));
                 }
                 else
                 {
@@ -598,10 +611,10 @@ namespace umbraco.cms.businesslogic
                         //its own + inherited property types, which is wrong. Once we are able to fully switch to the new api
                         //this should no longer be a problem as the composition always contains a correct list of property types.
                         var result = new Dictionary<int, PropertyType>();
-                        using (IRecordsReader dr =
-                            SqlHelper.ExecuteReader(
+                        using (var sqlHelper = Application.SqlHelper)
+                        using (IRecordsReader dr = sqlHelper.ExecuteReader(
                                 "select id from cmsPropertyType where contentTypeId = @ctId order by sortOrder",
-                                SqlHelper.CreateParameter("@ctId", Id)))
+                                sqlHelper.CreateParameter("@ctId", Id)))
                         {
                             while (dr.Read())
                             {
@@ -648,11 +661,10 @@ namespace umbraco.cms.businesslogic
                     if (ContentTypeItem == null)
                     {
                         //TODO Make this recursive, so it looks up Masters of the Master ContentType
-                        using (
-                            var dr =
-                                SqlHelper.ExecuteReader(
-                                    @"SELECT parentContentTypeId FROM cmsContentType2ContentType WHERE childContentTypeId = @id",
-                                    SqlHelper.CreateParameter("@id", Id)))
+                        using (var sqlHelper = Application.SqlHelper)
+                        using (var dr = sqlHelper.ExecuteReader(
+                            @"SELECT parentContentTypeId FROM cmsContentType2ContentType WHERE childContentTypeId = @id",
+                                sqlHelper.CreateParameter("@id", Id)))
                         {
                             while (dr.Read())
                             {
@@ -722,10 +734,11 @@ namespace umbraco.cms.businesslogic
             {
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                         "INSERT INTO [cmsContentType2ContentType] (parentContentTypeId, childContentTypeId) VALUES (@parentContentTypeId, @childContentTypeId)",
-                        SqlHelper.CreateParameter("@parentContentTypeId", parentContentTypeId),
-                        SqlHelper.CreateParameter("@childContentTypeId", Id));
+                        sqlHelper.CreateParameter("@parentContentTypeId", parentContentTypeId),
+                        sqlHelper.CreateParameter("@childContentTypeId", Id));
 
                     MasterContentTypes.Add(parentContentTypeId);
                 }
@@ -739,15 +752,17 @@ namespace umbraco.cms.businesslogic
 
         public bool IsMaster()
         {
-            return SqlHelper.ExecuteScalar<int>("select count(*) from cmsContentType2ContentType where parentContentTypeId = @parentContentTypeId",
-                SqlHelper.CreateParameter("@parentContentTypeId", this.Id)) > 0;
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("select count(*) from cmsContentType2ContentType where parentContentTypeId = @parentContentTypeId",
+                sqlHelper.CreateParameter("@parentContentTypeId", this.Id)) > 0;
         }
 
         public IEnumerable<ContentType> GetChildTypes()
         {
             var cts = new List<ContentType>();
-            using (var dr = SqlHelper.ExecuteReader(@"SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId = @parentContentTypeId",
-                SqlHelper.CreateParameter("@parentContentTypeId", Id)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(@"SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId = @parentContentTypeId",
+                sqlHelper.CreateParameter("@parentContentTypeId", Id)))
             {
                 while (dr.Read())
                 {
@@ -774,10 +789,11 @@ namespace umbraco.cms.businesslogic
 
                 RemoveMasterPropertyTypeData(contentTypeToRemove, this);
 
-                SqlHelper.ExecuteNonQuery(
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
                                           "DELETE FROM [cmsContentType2ContentType] WHERE parentContentTypeId = @parentContentTypeId AND childContentTypeId = @childContentTypeId",
-                                          SqlHelper.CreateParameter("@parentContentTypeId", parentContentTypeId),
-                                          SqlHelper.CreateParameter("@childContentTypeId", Id));
+                                          sqlHelper.CreateParameter("@parentContentTypeId", parentContentTypeId),
+                                          sqlHelper.CreateParameter("@childContentTypeId", Id));
                 MasterContentTypes.Remove(parentContentTypeId);
             }
         }
@@ -790,13 +806,14 @@ namespace umbraco.cms.businesslogic
                 {
                     // before we can remove a parent content type we need to remove all data that 
                     // relates to property types
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                             @"delete cmsPropertyData from cmsPropertyData
                             inner join cmsContent on cmsContent.nodeId = cmsPropertyData.contentNodeId
                             where cmsPropertyData.propertyTypeId = @propertyType
                             and contentType = @contentType",
-                        SqlHelper.CreateParameter("@contentType", currentContentType.Id),
-                        SqlHelper.CreateParameter("@propertyType", pt.Id));
+                        sqlHelper.CreateParameter("@contentType", currentContentType.Id),
+                        sqlHelper.CreateParameter("@propertyType", pt.Id));
                 }
             }
 
@@ -850,7 +867,8 @@ namespace umbraco.cms.businesslogic
                 if (_allowedChildContentTypeIDs == null)
                 {
                     _allowedChildContentTypeIDs = new List<int>();
-                    using (var dr = SqlHelper.ExecuteReader("Select AllowedId from cmsContentTypeAllowedContentType where id=" + Id))
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var dr = sqlHelper.ExecuteReader("Select AllowedId from cmsContentTypeAllowedContentType where id=" + Id))
                     {
                         while (dr.Read())
                         {
@@ -869,11 +887,13 @@ namespace umbraco.cms.businesslogic
                 //Note that this is currently only done to support both DocumentType and MediaType, which use the new api and MemberType that doesn't.
                 if (ContentTypeItem == null)
                 {
-                    SqlHelper.ExecuteNonQuery(
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(
                         "delete from cmsContentTypeAllowedContentType where id=" + Id);
                     foreach (int i in value)
                     {
-                        SqlHelper.ExecuteNonQuery(
+                        using (var sqlHelper = Application.SqlHelper)
+                            sqlHelper.ExecuteNonQuery(
                             "insert into cmsContentTypeAllowedContentType (id,AllowedId) values (" +
                             Id + "," + i + ")");
                     }
@@ -925,8 +945,8 @@ namespace umbraco.cms.businesslogic
         {
             var contentTypes = new List<ContentType>();
 
-            using (var dr =
-                SqlHelper.ExecuteReader(m_SQLOptimizedGetAll.Trim(), SqlHelper.CreateParameter("@nodeObjectType", nodeObjectType)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(m_SQLOptimizedGetAll.Trim(), sqlHelper.CreateParameter("@nodeObjectType", nodeObjectType)))
             {
                 while (dr.Read())
                 {
@@ -1110,12 +1130,14 @@ namespace umbraco.cms.businesslogic
             }
 
             //need to delete the allowed relationships between content types
-            SqlHelper.ExecuteNonQuery("delete from cmsContentTypeAllowedContentType where AllowedId=@allowedId or Id=@id",
-                SqlHelper.CreateParameter("@allowedId", Id),
-                SqlHelper.CreateParameter("@id", Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsContentTypeAllowedContentType where AllowedId=@allowedId or Id=@id",
+                sqlHelper.CreateParameter("@allowedId", Id),
+                sqlHelper.CreateParameter("@id", Id));
 
             // delete contenttype entrance
-            SqlHelper.ExecuteNonQuery("Delete from cmsContentType where NodeId = " + Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsContentType where NodeId = " + Id);
 
             // delete CMSNode entrance
             base.delete();
@@ -1188,7 +1210,8 @@ namespace umbraco.cms.businesslogic
             }
 
             // TODO: Load master content types
-            using (var dr = SqlHelper.ExecuteReader("Select allowAtRoot, isContainer, Alias,icon,thumbnail,description from cmsContentType where nodeid=" + Id)
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader("Select allowAtRoot, isContainer, Alias,icon,thumbnail,description from cmsContentType where nodeid=" + Id)
                 )
             {
                 if (dr.Read())
@@ -1358,9 +1381,10 @@ namespace umbraco.cms.businesslogic
         private static void PopulatePropertyData(PropertyType pt, int contentTypeId)
         {
             // NH: PropertyTypeId inserted directly into SQL instead of as a parameter for SQL CE 4 compatibility
-            SqlHelper.ExecuteNonQuery(
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(
                                       "insert into cmsPropertyData (contentNodeId, versionId, propertyTypeId) select contentId, versionId, " + pt.Id + " from cmsContent inner join cmsContentVersion on cmsContent.nodeId = cmsContentVersion.contentId where contentType = @contentTypeId",
-                                      SqlHelper.CreateParameter("@contentTypeId", contentTypeId));
+                                      sqlHelper.CreateParameter("@contentTypeId", contentTypeId));
         }
 
         #endregion
@@ -1559,10 +1583,12 @@ namespace umbraco.cms.businesslogic
             /// </summary>
             public void Delete()
             {
-                SqlHelper.ExecuteNonQuery("update cmsPropertyType set propertyTypeGroupId = NULL where propertyTypeGroupId = @id",
-                                          SqlHelper.CreateParameter("@id", Id));
-                SqlHelper.ExecuteNonQuery("delete from cmsPropertyTypeGroup where id = @id",
-                                          SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update cmsPropertyType set propertyTypeGroupId = NULL where propertyTypeGroupId = @id",
+                                          sqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("delete from cmsPropertyTypeGroup where id = @id",
+                                          sqlHelper.CreateParameter("@id", Id));
             }
 
             /// <summary>
@@ -1574,15 +1600,18 @@ namespace umbraco.cms.businesslogic
             {
                 try
                 {
-                    var tempCaption = SqlHelper.ExecuteScalar<string>("Select text from cmsPropertyTypeGroup where id = " + id.ToString());
-                    if (!tempCaption.StartsWith("#"))
-                        return tempCaption;
-                    var lang = Language.GetByCultureCode(Thread.CurrentThread.CurrentCulture.Name);
-                    if (lang != null)
+                    using (var sqlHelper = Application.SqlHelper)
                     {
-                        return new Dictionary.DictionaryItem(tempCaption.Substring(1, tempCaption.Length - 1)).Value(lang.id);
+                        var tempCaption = sqlHelper.ExecuteScalar<string>("Select text from cmsPropertyTypeGroup where id = " + id.ToString());
+                        if (!tempCaption.StartsWith("#"))
+                            return tempCaption;
+                        var lang = Language.GetByCultureCode(Thread.CurrentThread.CurrentCulture.Name);
+                        if (lang != null)
+                        {
+                            return new Dictionary.DictionaryItem(tempCaption.Substring(1, tempCaption.Length - 1)).Value(lang.id);
+                        }
+                        return "[" + tempCaption + "]";
                     }
-                    return "[" + tempCaption + "]";
                 }
                 catch
                 {
@@ -1599,8 +1628,11 @@ namespace umbraco.cms.businesslogic
             {
                 try
                 {
-                    var tempCaption = SqlHelper.ExecuteScalar<string>("Select text from cmsPropertyTypeGroup where id = " + id);
-                    return tempCaption;
+                    using (var sqlHelper = Application.SqlHelper)
+                    {
+                        var tempCaption = sqlHelper.ExecuteScalar<string>("Select text from cmsPropertyTypeGroup where id = " + id);
+                        return tempCaption;
+                    }
                 }
                 catch
                 {
@@ -1622,13 +1654,15 @@ namespace umbraco.cms.businesslogic
                 {
                     if (!_sortOrder.HasValue)
                     {
-                        _sortOrder = SqlHelper.ExecuteScalar<int>("select sortOrder from cmsPropertyTypeGroup where id = " + _id);
+                        using (var sqlHelper = Application.SqlHelper)
+                            _sortOrder = sqlHelper.ExecuteScalar<int>("select sortOrder from cmsPropertyTypeGroup where id = " + _id);
                     }
                     return _sortOrder.Value;
                 }
                 set
                 {
-                    SqlHelper.ExecuteNonQuery("update cmsPropertyTypeGroup set sortOrder = " + value + " where id =" + _id);
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery("update cmsPropertyTypeGroup set sortOrder = " + value + " where id =" + _id);
                 }
             }
 
diff --git a/src/umbraco.cms/businesslogic/Dictionary.cs b/src/umbraco.cms/businesslogic/Dictionary.cs
index 206965168e..c9674940d0 100644
--- a/src/umbraco.cms/businesslogic/Dictionary.cs
+++ b/src/umbraco.cms/businesslogic/Dictionary.cs
@@ -23,6 +23,9 @@ namespace umbraco.cms.businesslogic
     {
         private static readonly Guid TopLevelParent = new Guid(Constants.Conventions.Localization.DictionaryItemRootId);
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database")]
         protected static ISqlHelper SqlHelper
         {
diff --git a/src/umbraco.cms/businesslogic/Packager/Package.cs b/src/umbraco.cms/businesslogic/Packager/Package.cs
index d557b30d21..768757c076 100644
--- a/src/umbraco.cms/businesslogic/Packager/Package.cs
+++ b/src/umbraco.cms/businesslogic/Packager/Package.cs
@@ -10,6 +10,10 @@ namespace umbraco.cms.businesslogic.packager
     [EditorBrowsable(EditorBrowsableState.Never)]
     public class Package
     {
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -32,73 +36,79 @@ namespace umbraco.cms.businesslogic.packager
 
         public Package(Guid Id)
         {
-            int installStatusId = SqlHelper.ExecuteScalar<int>(
-                "select id from umbracoInstalledPackages where package = @package and upgradeId = 0",
-                SqlHelper.CreateParameter("@package", Id));
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                int installStatusId = sqlHelper.ExecuteScalar<int>(
+                    "select id from umbracoInstalledPackages where package = @package and upgradeId = 0",
+                    sqlHelper.CreateParameter("@package", Id));
 
-            if (installStatusId > 0)
-                Initialize(installStatusId);
-            else
-                throw new ArgumentException("Package with id '" + Id.ToString() + "' is not installed");
+                if (installStatusId > 0)
+                    Initialize(installStatusId);
+                else
+                    throw new ArgumentException("Package with id '" + Id.ToString() + "' is not installed");
+            }
         }
 
         private void Initialize(int id)
         {
-
-            IRecordsReader dr =
-                SqlHelper.ExecuteReader(
-                    "select id, uninstalled, upgradeId, installDate, userId, package, versionMajor, versionMinor, versionPatch from umbracoInstalledPackages where id = @id",
-                    SqlHelper.CreateParameter("@id", id));
-
-            if (dr.Read())
-            {
-                Id = id;
-                Uninstalled = dr.GetBoolean("uninstalled");
-                UpgradeId = dr.GetInt("upgradeId");
-                InstallDate = dr.GetDateTime("installDate");
-                User = User.GetUser(dr.GetInt("userId"));
-                PackageId = dr.GetGuid("package");
-                VersionMajor = dr.GetInt("versionMajor");
-                VersionMinor = dr.GetInt("versionMinor");
-                VersionPatch = dr.GetInt("versionPatch");
+            using (var sqlHelper = Application.SqlHelper) {
+                using (IRecordsReader dr =
+                 sqlHelper.ExecuteReader(
+                     "select id, uninstalled, upgradeId, installDate, userId, package, versionMajor, versionMinor, versionPatch from umbracoInstalledPackages where id = @id",
+                     sqlHelper.CreateParameter("@id", id)))
+                {
+                    if (dr.Read())
+                    {
+                        Id = id;
+                        Uninstalled = dr.GetBoolean("uninstalled");
+                        UpgradeId = dr.GetInt("upgradeId");
+                        InstallDate = dr.GetDateTime("installDate");
+                        User = User.GetUser(dr.GetInt("userId"));
+                        PackageId = dr.GetGuid("package");
+                        VersionMajor = dr.GetInt("versionMajor");
+                        VersionMinor = dr.GetInt("versionMinor");
+                        VersionPatch = dr.GetInt("versionPatch");
+                    }
+                }
             }
-            dr.Close();
         }
 
         [MethodImpl(MethodImplOptions.Synchronized)]
         public void Save()
         {
-
-            IParameter[] values = {
-                SqlHelper.CreateParameter("@uninstalled", Uninstalled),
-                SqlHelper.CreateParameter("@upgradeId", UpgradeId),
-                SqlHelper.CreateParameter("@installDate", InstallDate),
-                SqlHelper.CreateParameter("@userId", User.Id),
-                SqlHelper.CreateParameter("@versionMajor", VersionMajor),
-                SqlHelper.CreateParameter("@versionMinor", VersionMinor),
-                SqlHelper.CreateParameter("@versionPatch", VersionPatch),
-                SqlHelper.CreateParameter("@id", Id)
-            };
-
-            // check if package status exists
-            if (Id == 0)
+            using (var sqlHelper = Application.SqlHelper)
             {
-                // The method is synchronized
-                SqlHelper.ExecuteNonQuery("INSERT INTO umbracoInstalledPackages (uninstalled, upgradeId, installDate, userId, versionMajor, versionMinor, versionPatch) VALUES (@uninstalled, @upgradeId, @installDate, @userId, @versionMajor, @versionMinor, @versionPatch)", values);
-                Id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM umbracoInstalledPackages");
-            }
+                IParameter[] values = {
+                    sqlHelper.CreateParameter("@uninstalled", Uninstalled),
+                    sqlHelper.CreateParameter("@upgradeId", UpgradeId),
+                    sqlHelper.CreateParameter("@installDate", InstallDate),
+                    sqlHelper.CreateParameter("@userId", User.Id),
+                    sqlHelper.CreateParameter("@versionMajor", VersionMajor),
+                    sqlHelper.CreateParameter("@versionMinor", VersionMinor),
+                    sqlHelper.CreateParameter("@versionPatch", VersionPatch),
+                    sqlHelper.CreateParameter("@id", Id)
+                };
 
-            SqlHelper.ExecuteNonQuery(
-                "update umbracoInstalledPackages set " +
-                "uninstalled = @uninstalled, " +
-                "upgradeId = @upgradeId, " +
-                "installDate = @installDate, " +
-                "userId = @userId, " +
-                "versionMajor = @versionMajor, " +
-                "versionMinor = @versionMinor, " +
-                "versionPatch = @versionPatch " +
-                "where id = @id",
-                values);
+                // check if package status exists
+                if (Id == 0)
+                {
+                    // The method is synchronized
+                    sqlHelper.ExecuteNonQuery("INSERT INTO umbracoInstalledPackages (uninstalled, upgradeId, installDate, userId, versionMajor, versionMinor, versionPatch) VALUES (@uninstalled, @upgradeId, @installDate, @userId, @versionMajor, @versionMinor, @versionPatch)", values);
+                    Id = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM umbracoInstalledPackages");
+                }
+
+                sqlHelper.ExecuteNonQuery(
+                    "update umbracoInstalledPackages set " +
+                    "uninstalled = @uninstalled, " +
+                    "upgradeId = @upgradeId, " +
+                    "installDate = @installDate, " +
+                    "userId = @userId, " +
+                    "versionMajor = @versionMajor, " +
+                    "versionMinor = @versionMinor, " +
+                    "versionPatch = @versionPatch " +
+                    "where id = @id",
+                    values);
+            }
         }
 
         public bool Uninstalled { get; set; }
diff --git a/src/umbraco.cms/businesslogic/Property/Property.cs b/src/umbraco.cms/businesslogic/Property/Property.cs
index fbb606a11e..278b196c60 100644
--- a/src/umbraco.cms/businesslogic/Property/Property.cs
+++ b/src/umbraco.cms/businesslogic/Property/Property.cs
@@ -27,6 +27,10 @@ namespace umbraco.cms.businesslogic.property
         private interfaces.IData _data;
         private int _id;
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -51,13 +55,16 @@ namespace umbraco.cms.businesslogic.property
         public Property(int Id)
         {
             _id = Id;
-            _pt = PropertyType.GetPropertyType(
-                SqlHelper.ExecuteScalar<int>("select propertytypeid from cmsPropertyData where id = @id",
-                                             SqlHelper.CreateParameter("@id", Id)));
-            if (_pt.DataTypeDefinition.DataType == null)
-                throw new Exception(string.Format("Could not load datatype '{0}'", _pt.DataTypeDefinition.Text));
-            _data = _pt.DataTypeDefinition.DataType.Data;
-            _data.PropertyId = Id;
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                _pt = PropertyType.GetPropertyType(
+                    sqlHelper.ExecuteScalar<int>("select propertytypeid from cmsPropertyData where id = @id",
+                        sqlHelper.CreateParameter("@id", Id)));
+                if (_pt.DataTypeDefinition.DataType == null)
+                    throw new Exception(string.Format("Could not load datatype '{0}'", _pt.DataTypeDefinition.Text));
+                _data = _pt.DataTypeDefinition.DataType.Data;
+                _data.PropertyId = Id;
+            }
         }
 
         internal Property(Umbraco.Core.Models.Property property)
@@ -96,17 +103,20 @@ namespace umbraco.cms.businesslogic.property
         {
             get
             {
-                using (IRecordsReader dr = SqlHelper.ExecuteReader("SELECT versionId FROM cmsPropertyData WHERE id = " + _id.ToString()))
+                using (var sqlHelper = Application.SqlHelper)
+                using (IRecordsReader dr = sqlHelper.ExecuteReader("SELECT versionId FROM cmsPropertyData WHERE id = " + _id.ToString()))
                 {
                     dr.Read();
                     return dr.GetGuid("versionId");
                 }
             }
         }
+
         public int Id
         {
             get { return _id; }
         }
+
         public propertytype.PropertyType PropertyType
         {
             get
@@ -132,10 +142,16 @@ namespace umbraco.cms.businesslogic.property
 
         public void delete()
         {
-            int contentId = SqlHelper.ExecuteScalar<int>("Select contentNodeId from cmsPropertyData where Id = " + _id);
-            SqlHelper.ExecuteNonQuery("Delete from cmsPropertyData where PropertyTypeId =" + _pt.Id + " And contentNodeId = " + contentId);
-            _data.Delete();
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                int contentId = sqlHelper.ExecuteScalar<int>("Select contentNodeId from cmsPropertyData where Id = " + _id);
+
+                sqlHelper.ExecuteNonQuery("Delete from cmsPropertyData where PropertyTypeId =" + _pt.Id + " And contentNodeId = " + contentId);
+
+                _data.Delete();
+            }
         }
+
         public XmlNode ToXml(XmlDocument xd)
         {
             var serializer = new EntityXmlSerializer();
@@ -143,21 +159,23 @@ namespace umbraco.cms.businesslogic.property
             return xml.GetXmlNode(xd);
         }
 
-
         [MethodImpl(MethodImplOptions.Synchronized)]
-        public static Property MakeNew(propertytype.PropertyType pt, Content c, Guid versionId)
+        public static Property MakeNew(PropertyType pt, Content c, Guid versionId)
         {
             int newPropertyId = 0;
             // The method is synchronized
-            SqlHelper.ExecuteNonQuery("INSERT INTO cmsPropertyData (contentNodeId, versionId, propertyTypeId) VALUES(@contentNodeId, @versionId, @propertyTypeId)",
-                                      SqlHelper.CreateParameter("@contentNodeId", c.Id),
-                                      SqlHelper.CreateParameter("@versionId", versionId),
-                                      SqlHelper.CreateParameter("@propertyTypeId", pt.Id));
-            newPropertyId = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsPropertyData");
-            interfaces.IData d = pt.DataTypeDefinition.DataType.Data;
-            d.MakeNew(newPropertyId);
-            return new Property(newPropertyId, pt);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                sqlHelper.ExecuteNonQuery(
+                    "INSERT INTO cmsPropertyData (contentNodeId, versionId, propertyTypeId) VALUES(@contentNodeId, @versionId, @propertyTypeId)",
+                    sqlHelper.CreateParameter("@contentNodeId", c.Id),
+                    sqlHelper.CreateParameter("@versionId", versionId),
+                    sqlHelper.CreateParameter("@propertyTypeId", pt.Id));
+                newPropertyId = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsPropertyData");
+                interfaces.IData d = pt.DataTypeDefinition.DataType.Data;
+                d.MakeNew(newPropertyId);
+                return new Property(newPropertyId, pt);
+            }
         }
     }
-
-}
+}
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/RecycleBin.cs b/src/umbraco.cms/businesslogic/RecycleBin.cs
index 3f4ad28b94..f55de7db87 100644
--- a/src/umbraco.cms/businesslogic/RecycleBin.cs
+++ b/src/umbraco.cms/businesslogic/RecycleBin.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using umbraco.BusinessLogic;
 using Umbraco.Core;
 using umbraco.DataLayer;
 using umbraco.cms.businesslogic.web;
@@ -106,7 +107,8 @@ namespace umbraco.cms.businesslogic
             string sql = String.Format(RecycleBin.m_ChildCountSQL,
                         (int) type);
 
-            return SqlHelper.ExecuteScalar<int>(sql, SqlHelper.CreateParameter("@nodeObjectType", objectType));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>(sql, sqlHelper.CreateParameter("@nodeObjectType", objectType));
         }
         #endregion
 
@@ -157,9 +159,10 @@ namespace umbraco.cms.businesslogic
             {
                 System.Collections.ArrayList tmp = new System.Collections.ArrayList();
 
-                using (IRecordsReader dr = SqlHelper.ExecuteReader(m_ChildSQL,
-                            SqlHelper.CreateParameter("@parentId", this.Id),
-                            SqlHelper.CreateParameter("@type", _nodeObjectType)))
+                using (var sqlHelper = Application.SqlHelper)
+                using (IRecordsReader dr = sqlHelper.ExecuteReader(m_ChildSQL,
+                            sqlHelper.CreateParameter("@parentId", this.Id),
+                            sqlHelper.CreateParameter("@type", _nodeObjectType)))
                 {
                     while (dr.Read())
                     {
diff --git a/src/umbraco.cms/businesslogic/Tags/Tag.cs b/src/umbraco.cms/businesslogic/Tags/Tag.cs
index 5917c0629c..8534d02d26 100644
--- a/src/umbraco.cms/businesslogic/Tags/Tag.cs
+++ b/src/umbraco.cms/businesslogic/Tags/Tag.cs
@@ -118,11 +118,9 @@ namespace umbraco.cms.businesslogic.Tags
                 sql += "left outer join cmsTagRelationship on (cmsTags.id = cmsTagRelationship.TagId and cmsTagRelationship.nodeId = " + string.Format("{0}", nodeId) + ") ";
                 sql += "where cmsTagRelationship.tagId is null and cmsTags.id = " + string.Format("{0}", id);
 
-                SqlHelper.ExecuteNonQuery(sql);
-
-
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(sql);
             }
-
         }
 
         public static void MergeTagsToNode(int nodeId, string tags, string group)
@@ -164,7 +162,8 @@ namespace umbraco.cms.businesslogic.Tags
             sql += " inner join  cmsTags as OldTags on (cmsTagRelationship.tagId = OldTags.Id) ";
             sql += " where NewTagsSet.Id is null ";
             sql += " )";
-            SqlHelper.ExecuteNonQuery(sql);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(sql);
 
             //adds any tags found in csv that aren't in cmsTag for that group
             sql = "insert into cmsTags (Tag," + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("Group") + @") ";
@@ -172,7 +171,8 @@ namespace umbraco.cms.businesslogic.Tags
             sql += " " + TagSet + " ";
             sql += " left outer join cmsTags on (TagSet.Tag = cmsTags.Tag and TagSet." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("Group") + " = cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("Group") + ")";
             sql += " where cmsTags.Id is null ";
-            SqlHelper.ExecuteNonQuery(sql);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(sql);
 
             //adds any tags found in csv that aren't in tagrelationships
             sql = "insert into cmsTagRelationship (TagId,NodeId,propertyTypeId) ";
@@ -185,7 +185,8 @@ namespace umbraco.cms.businesslogic.Tags
             sql += "left outer join cmsTagRelationship ";
             sql += "on (cmsTagRelationship.TagId = NewTagsSet.Id and cmsTagRelationship.NodeId = " + string.Format("{0}", nodeId) + ") ";
             sql += "where cmsTagRelationship.tagId is null ";
-            SqlHelper.ExecuteNonQuery(sql);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(sql);
 
         }
 
@@ -195,10 +196,12 @@ namespace umbraco.cms.businesslogic.Tags
         /// <param name="tagId"></param>
         public static void RemoveTag(int tagId)
         {
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (tagid = @tagId)",
-               SqlHelper.CreateParameter("@tagId", tagId));
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTags WHERE (id = @tagId)",
-               SqlHelper.CreateParameter("@tagId", tagId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (tagid = @tagId)",
+                    sqlHelper.CreateParameter("@tagId", tagId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("DELETE FROM cmsTags WHERE (id = @tagId)", 
+                    sqlHelper.CreateParameter("@tagId", tagId));
         }
 
         /// <summary>
@@ -207,8 +210,9 @@ namespace umbraco.cms.businesslogic.Tags
         /// <param name="nodeId"></param>
         public static void RemoveTagsFromNode(int nodeId)
         {
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE nodeId = @nodeId",
-              SqlHelper.CreateParameter("@nodeId", nodeId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE nodeId = @nodeId",
+                    sqlHelper.CreateParameter("@nodeId", nodeId));
         }
 
         /// <summary>
@@ -218,9 +222,10 @@ namespace umbraco.cms.businesslogic.Tags
         /// <param name="group"></param>
         public static void RemoveTagsFromNode(int nodeId, string group)
         {
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (nodeId = @nodeId) AND EXISTS (SELECT id FROM cmsTags WHERE (cmsTagRelationship.tagId = id) AND (" + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + " = @group));",
-               SqlHelper.CreateParameter("@nodeId", nodeId),
-               SqlHelper.CreateParameter("@group", group));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (nodeId = @nodeId) AND EXISTS (SELECT id FROM cmsTags WHERE (cmsTagRelationship.tagId = id) AND (" + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + " = @group));",
+                    sqlHelper.CreateParameter("@nodeId", nodeId),
+                    sqlHelper.CreateParameter("@group", group));
         }
 
         /// <summary>
@@ -234,17 +239,19 @@ namespace umbraco.cms.businesslogic.Tags
             int tagId = GetTagId(tag, group);
             if (tagId != 0)
             {
-                SqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (nodeId = @nodeId and tagId = @tagId)",
-                    SqlHelper.CreateParameter("@nodeId", nodeId),
-                    SqlHelper.CreateParameter("@tagId", tagId));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("DELETE FROM cmsTagRelationship WHERE (nodeId = @nodeId and tagId = @tagId)",
+                        sqlHelper.CreateParameter("@nodeId", nodeId),
+                        sqlHelper.CreateParameter("@tagId", tagId));
             }
         }
 
         public static int AddTag(string tag, string group)
         {
-            SqlHelper.ExecuteNonQuery("INSERT INTO cmsTags(tag," + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + ") VALUES (@tag,@group)",
-                SqlHelper.CreateParameter("@tag", tag.Trim()),
-                SqlHelper.CreateParameter("@group", group));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("INSERT INTO cmsTags(tag," + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + ") VALUES (@tag,@group)",
+                    sqlHelper.CreateParameter("@tag", tag.Trim()),
+                    sqlHelper.CreateParameter("@group", group));
             return GetTagId(tag, group);
         }
 
@@ -252,13 +259,15 @@ namespace umbraco.cms.businesslogic.Tags
         {
             int retval = 0;
             string sql = "SELECT id FROM cmsTags where tag=@tag AND " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + "=@group;";
-            object result = SqlHelper.ExecuteScalar<object>(sql,
-                SqlHelper.CreateParameter("@tag", tag),
-                SqlHelper.CreateParameter("@group", group));
-
-            if (result != null)
-                retval = int.Parse(result.ToString());
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                object result = sqlHelper.ExecuteScalar<object>(sql,
+                    sqlHelper.CreateParameter("@tag", tag),
+                    sqlHelper.CreateParameter("@group", group));
 
+                if (result != null)
+                    retval = int.Parse(result.ToString());
+            }
             return retval;
         }
 
@@ -269,10 +278,10 @@ namespace umbraco.cms.businesslogic.Tags
                   WHERE cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + @" = @group AND cmsTagRelationship.nodeid = @nodeid
                   GROUP BY cmsTags.id, cmsTags.tag, cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group");
 
-            return ConvertSqlToTags(sql,
-                SqlHelper.CreateParameter("@group", group),
-                SqlHelper.CreateParameter("@nodeid", nodeId));
-
+            using (var sqlHelper = Application.SqlHelper)
+                return ConvertSqlToTags(sql,
+                    sqlHelper.CreateParameter("@group", group),
+                    sqlHelper.CreateParameter("@nodeid", nodeId));
         }
 
         /// <summary>
@@ -288,8 +297,8 @@ namespace umbraco.cms.businesslogic.Tags
                         WHERE cmsTagRelationShip.nodeid = @nodeId
                         GROUP BY cmsTags.id, cmsTags.tag, cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group");
 
-            return ConvertSqlToTags(sql, SqlHelper.CreateParameter("@nodeId", nodeId));
-
+            using (var sqlHelper = Application.SqlHelper)
+                return ConvertSqlToTags(sql, sqlHelper.CreateParameter("@nodeId", nodeId));
         }
 
         /// <summary>
@@ -305,8 +314,8 @@ namespace umbraco.cms.businesslogic.Tags
                             WHERE cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group") + @" = @group
                             GROUP BY cmsTags.id, cmsTags.tag, cmsTags." + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("group");
 
-            return ConvertSqlToTags(sql, SqlHelper.CreateParameter("@group", group));
-
+            using (var sqlHelper = Application.SqlHelper)
+                return ConvertSqlToTags(sql, sqlHelper.CreateParameter("@group", group));
         }
 
         /// <summary>
@@ -334,8 +343,9 @@ namespace umbraco.cms.businesslogic.Tags
                             INNER JOIN umbracoNode ON cmsTagRelationShip.nodeId = umbracoNode.id
                             WHERE (cmsTags.tag IN ({0})) AND nodeObjectType=@nodeType";
 
-            using (IRecordsReader rr = SqlHelper.ExecuteReader(string.Format(sql, GetSqlStringArray(tags)),
-                SqlHelper.CreateParameter("@nodeType", Document._objectType)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader rr = sqlHelper.ExecuteReader(string.Format(sql, GetSqlStringArray(tags)),
+                sqlHelper.CreateParameter("@nodeType", Document._objectType)))
             {
                 while (rr.Read())
                 {
@@ -355,7 +365,9 @@ namespace umbraco.cms.businesslogic.Tags
 
             string sql = @"SELECT DISTINCT cmsTagRelationShip.nodeid from cmsTagRelationShip
                             INNER JOIN cmsTags ON cmsTagRelationShip.tagid = cmsTags.id WHERE (cmsTags.tag IN (" + GetSqlStringArray(tags) + "))";
-            using (IRecordsReader rr = SqlHelper.ExecuteReader(sql))
+
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader rr = sqlHelper.ExecuteReader(sql))
             {
                 while (rr.Read())
                 {
@@ -364,12 +376,14 @@ namespace umbraco.cms.businesslogic.Tags
             }
             return nodes;
         }
+
         private static string GetSqlSet(string commaSeparatedArray, string group)
         {
             // create array
             var array = commaSeparatedArray.Trim().Split(',').ToList().ConvertAll(tag => string.Format("select '{0}' as Tag, '{1}' as " + SqlSyntaxContext.SqlSyntaxProvider.GetQuotedColumnName("Group"), tag.Replace("'", ""), group)).ToArray();
             return "(" + string.Join(" union ", array).Replace("  ", " ") + ") as TagSet";
         }
+
         private static string GetSqlStringArray(string commaSeparatedArray)
         {
             // create array
@@ -382,7 +396,8 @@ namespace umbraco.cms.businesslogic.Tags
                 string trimmedItem = item.Trim();
                 if (trimmedItem.Length > 0)
                 {
-                    sqlArray.Append("'").Append(SqlHelper.EscapeString(trimmedItem)).Append("',");
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlArray.Append("'").Append(sqlHelper.EscapeString(trimmedItem)).Append("',");
                 }
             }
 
@@ -395,7 +410,8 @@ namespace umbraco.cms.businesslogic.Tags
         private static IEnumerable<Tag> ConvertSqlToTags(string sql, params IParameter[] param)
         {
             List<Tag> tags = new List<Tag>();
-            using (IRecordsReader rr = SqlHelper.ExecuteReader(sql, param))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader rr = sqlHelper.ExecuteReader(sql, param))
             {
                 while (rr.Read())
                 {
@@ -411,13 +427,13 @@ namespace umbraco.cms.businesslogic.Tags
             return tags;
         }
 
-        private static ISqlHelper SqlHelper
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        protected static ISqlHelper SqlHelper
         {
-            get
-            {
-                return Application.SqlHelper;
-            }
+            get { return Application.SqlHelper; }
         }
-
     }
 }
diff --git a/src/umbraco.cms/businesslogic/datatype/BaseDataType.cs b/src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
index ccfd0ddf69..0e0b7e012f 100644
--- a/src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
+++ b/src/umbraco.cms/businesslogic/datatype/BaseDataType.cs
@@ -14,12 +14,7 @@ namespace umbraco.cms.businesslogic.datatype
 		private int _datatypedefinitionid;
 		private string _datafield = "";
 		private DBTypes _DBType;
-
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
+        
 		public BaseDataType()
 		{}
 
@@ -48,7 +43,8 @@ namespace umbraco.cms.businesslogic.datatype
 			}
 			set {
 				_DBType = value;
-				 SqlHelper.ExecuteNonQuery("update cmsDataType set  dbType = '" + value.ToString() + "' where nodeId = @datadefinitionid", SqlHelper.CreateParameter("@datadefinitionid",_datatypedefinitionid));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("update cmsDataType set  dbType = '" + value.ToString() + "' where nodeId = @datadefinitionid", sqlHelper.CreateParameter("@datadefinitionid",_datatypedefinitionid));
 			}
 		}
 		// Umbraco legacy - get the datafield - the columnname of the cmsPropertyData table
@@ -61,10 +57,13 @@ namespace umbraco.cms.businesslogic.datatype
             {
                 if (_datafield == "")
                 {
-                    string dbtypestr = SqlHelper.ExecuteScalar<string>("select dbType from cmsDataType where nodeId = @datadefinitionid", SqlHelper.CreateParameter("@datadefinitionid", _datatypedefinitionid));
-                    DBTypes DataTypeSQLType = GetDBType(dbtypestr);
-                    _DBType = DataTypeSQLType;
-                    _datafield = GetDataFieldName(_DBType);
+                    using (var sqlHelper = Application.SqlHelper)
+                    { 
+                        string dbtypestr = sqlHelper.ExecuteScalar<string>("select dbType from cmsDataType where nodeId = @datadefinitionid", sqlHelper.CreateParameter("@datadefinitionid", _datatypedefinitionid));
+                        DBTypes DataTypeSQLType = GetDBType(dbtypestr);
+                        _DBType = DataTypeSQLType;
+                        _datafield = GetDataFieldName(_DBType);
+                    }
                 }
                 return _datafield;
             }            
diff --git a/src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs b/src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
index c71282f998..5d2434164f 100644
--- a/src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DataEditorSettingsStorage.cs
@@ -27,23 +27,21 @@ namespace umbraco.cms.businesslogic.datatype
 
         public List<Setting<string, string>> GetSettings(int dataTypeNodeID)
         {
-
             string sql = "select * from cmsDataTypePreValues where datatypenodeid = @datatypenodeid";
-            IRecordsReader settingsReader = sqlHelper.ExecuteReader(sql, sqlHelper.CreateParameter("@datatypenodeid", dataTypeNodeID));
-
-            List<Setting<string, string>> settings = new List<Setting<string, string>>();
-
-            while (settingsReader.Read())
+            using (IRecordsReader settingsReader = sqlHelper.ExecuteReader(sql, sqlHelper.CreateParameter("@datatypenodeid", dataTypeNodeID)))
             {
-                Setting<string, string> setting = new Setting<string, string>();
-                setting.Key = settingsReader.GetString("alias");
-                setting.Value = settingsReader.GetString("value");
-                settings.Add(setting);
+                List<Setting<string, string>> settings = new List<Setting<string, string>>();
+
+                while (settingsReader.Read())
+                {
+                    Setting<string, string> setting = new Setting<string, string>();
+                    setting.Key = settingsReader.GetString("alias");
+                    setting.Value = settingsReader.GetString("value");
+                    settings.Add(setting);
+                }
+
+                return settings;
             }
-
-            settingsReader.Dispose();
-
-            return settings;
         }
 
 
diff --git a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
index dc78b7985c..7900ef6d88 100644
--- a/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DefaultData.cs
@@ -25,6 +25,9 @@ namespace umbraco.cms.businesslogic.datatype
 		private Guid? _version = null;
 		private int? _nodeId = null;
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
diff --git a/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs b/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
index db9d40cd44..7faa69ebb0 100644
--- a/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
+++ b/src/umbraco.cms/businesslogic/datatype/DefaultPreValueEditor.cs
@@ -30,7 +30,10 @@ namespace umbraco.cms.businesslogic.datatype
 
         private Dictionary<string, DataEditorSettingType> dtSettings = new Dictionary<string, DataEditorSettingType>();
 
-
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -116,8 +119,8 @@ namespace umbraco.cms.businesslogic.datatype
                     else
                         throw new ArgumentException("Datatype is not initialized");
 
-                    _prevalue =
-                        SqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where DataTypeNodeId = " + defId);
+                    using (var sqlHelper = Application.SqlHelper)
+                        _prevalue = sqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where DataTypeNodeId = " + defId);
                 }
                 return _prevalue;
             }
@@ -133,13 +136,17 @@ namespace umbraco.cms.businesslogic.datatype
 
                 _prevalue = value;
                 ensurePrevalue();
-                IParameter[] SqlParams = new IParameter[]
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    IParameter[] SqlParams = new IParameter[]
                     {
-                        SqlHelper.CreateParameter("@value", _textbox.Text),
-                        SqlHelper.CreateParameter("@dtdefid", defId)
+                        sqlHelper.CreateParameter("@value", _textbox.Text),
+                        sqlHelper.CreateParameter("@dtdefid", defId)
                     };
-                // update prevalue
-                SqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value where datatypeNodeId = @dtdefid", SqlParams);
+
+                    // update prevalue
+                    sqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value where datatypeNodeId = @dtdefid", SqlParams);
+                }
             }
         }
 
@@ -257,8 +264,9 @@ namespace umbraco.cms.businesslogic.datatype
         [Obsolete("Use the PreValues class for data access instead")]
         public static string GetPrevalueFromId(int Id)
         {
-            return SqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where id = @id",
-                                                   SqlHelper.CreateParameter("@id", Id));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where id = @id",
+                                                   sqlHelper.CreateParameter("@id", Id));
         }
 
 
diff --git a/src/umbraco.cms/businesslogic/datatype/PreValue.cs b/src/umbraco.cms/businesslogic/datatype/PreValue.cs
index cefdbb2bae..969e23006a 100644
--- a/src/umbraco.cms/businesslogic/datatype/PreValue.cs
+++ b/src/umbraco.cms/businesslogic/datatype/PreValue.cs
@@ -17,11 +17,6 @@ namespace umbraco.cms.businesslogic.datatype
     [Obsolete("This class is no longer used and will be removed from the codebase in the future.")]
     public class PreValue
     {
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
         #region Contructors
         /// <summary>
         /// Initializes a new instance of the <see cref="PreValue"/> class.
@@ -69,13 +64,15 @@ namespace umbraco.cms.businesslogic.datatype
         /// <param name="Value">The value.</param>
         public PreValue(int DataTypeId, string Value)
         {
-            var id = SqlHelper.ExecuteScalar<object>(
-                "Select id from cmsDataTypePreValues where [Value] = @value and DataTypeNodeId = @dataTypeId",
-                SqlHelper.CreateParameter("@dataTypeId", DataTypeId),
-                SqlHelper.CreateParameter("@value", Value));
-            if (id != null)
-                _id = int.Parse(id.ToString());
-
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                var id = sqlHelper.ExecuteScalar<object>(
+                    "Select id from cmsDataTypePreValues where [Value] = @value and DataTypeNodeId = @dataTypeId",
+                    sqlHelper.CreateParameter("@dataTypeId", DataTypeId),
+                    sqlHelper.CreateParameter("@value", Value));
+                if (id != null)
+                    _id = int.Parse(id.ToString());
+            }
             Initialize();
         } 
         #endregion
@@ -89,12 +86,15 @@ namespace umbraco.cms.businesslogic.datatype
         [MethodImpl(MethodImplOptions.Synchronized)]
         public static PreValue MakeNew(int dataTypeDefId, string value)
         {
-            SqlHelper.ExecuteNonQuery(
-                "insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
-                SqlHelper.CreateParameter("@dtdefid", dataTypeDefId),
-                SqlHelper.CreateParameter("@value", value));
-            var id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsDataTypePreValues");
-            return new PreValue(id);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                sqlHelper.ExecuteNonQuery(
+                    "insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+                    sqlHelper.CreateParameter("@dtdefid", dataTypeDefId),
+                    sqlHelper.CreateParameter("@value", value));
+                var id = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsDataTypePreValues");
+                return new PreValue(id);
+            }
         }
 
         #region Private members
@@ -153,8 +153,9 @@ namespace umbraco.cms.businesslogic.datatype
                 throw new ArgumentNullException("Id");
             }
 
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = @id",
-                SqlHelper.CreateParameter("@id", this.Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = @id",
+                sqlHelper.CreateParameter("@id", this.Id));
         }
 
         /// <summary>
@@ -167,29 +168,34 @@ namespace umbraco.cms.businesslogic.datatype
             if (Id == 0)
             {
                 // Update sortOrder
-                var tempSortOrder = SqlHelper.ExecuteScalar<object>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dataTypeId", SqlHelper.CreateParameter("@dataTypeId", DataTypeId));
-                var sortOrder = 0;
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    var tempSortOrder = sqlHelper.ExecuteScalar<object>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dataTypeId", sqlHelper.CreateParameter("@dataTypeId", DataTypeId));
+                    var sortOrder = 0;
 
-                if (tempSortOrder != null && int.TryParse(tempSortOrder.ToString(), out sortOrder))
-                    SortOrder = sortOrder + 1;
-                else
-                    SortOrder = 1;
-
-                var sqlParams = new IParameter[] {
-								SqlHelper.CreateParameter("@value",Value),
-								SqlHelper.CreateParameter("@dtdefid",DataTypeId),
-                                SqlHelper.CreateParameter("@alias",Alias)};
-                // The method is synchronized
-                SqlHelper.ExecuteNonQuery("INSERT INTO cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) VALUES (@dtdefid,@value,0,'@alias')", sqlParams);
-                _id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsDataTypePreValues");
+                    if (tempSortOrder != null && int.TryParse(tempSortOrder.ToString(), out sortOrder))
+                        SortOrder = sortOrder + 1;
+                    else
+                        SortOrder = 1;
+             
+                    var sqlParams = new IParameter[] {
+								sqlHelper.CreateParameter("@value",Value),
+								sqlHelper.CreateParameter("@dtdefid",DataTypeId),
+                                sqlHelper.CreateParameter("@alias",Alias)};
+                
+                    // The method is synchronized
+                    sqlHelper.ExecuteNonQuery("INSERT INTO cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) VALUES (@dtdefid,@value,0,'@alias')", sqlParams);
+                    _id = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsDataTypePreValues");
+                }
             }
 
-            SqlHelper.ExecuteNonQuery(
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery(
                 "update cmsDataTypePreValues set sortorder = @sortOrder, [value] = @value, alias = @alias where id = @id",
-                SqlHelper.CreateParameter("@sortOrder", SortOrder),
-                SqlHelper.CreateParameter("@value", Value),
-                SqlHelper.CreateParameter("@id", Id),
-                SqlHelper.CreateParameter("@alias", Alias));
+                sqlHelper.CreateParameter("@sortOrder", SortOrder),
+                sqlHelper.CreateParameter("@value", Value),
+                sqlHelper.CreateParameter("@id", Id),
+                sqlHelper.CreateParameter("@alias", Alias));
         } 
         
         #endregion
@@ -200,16 +206,18 @@ namespace umbraco.cms.businesslogic.datatype
         /// </summary>
         private void Initialize()
         {
-            var dr = SqlHelper.ExecuteReader(
-                 "Select id, sortorder, [value], alias from cmsDataTypePreValues where id = @id order by sortorder",
-                 SqlHelper.CreateParameter("@id", Id));
-            if (dr.Read())
-            {
-                SortOrder = dr.GetInt("sortorder");
-                Value = dr.GetString("value");
-                Alias = dr.GetString("alias");
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(
+                "Select id, sortorder, [value], alias from cmsDataTypePreValues where id = @id order by sortorder",
+                sqlHelper.CreateParameter("@id", Id))) 
+            { 
+                if (dr.Read())
+                {
+                    SortOrder = dr.GetInt("sortorder");
+                    Value = dr.GetString("value");
+                    Alias = dr.GetString("alias");
+                }
             }
-            dr.Close();
         } 
         #endregion
        
diff --git a/src/umbraco.cms/businesslogic/datatype/PreValues.cs b/src/umbraco.cms/businesslogic/datatype/PreValues.cs
index da23f650bd..932e3ba322 100644
--- a/src/umbraco.cms/businesslogic/datatype/PreValues.cs
+++ b/src/umbraco.cms/businesslogic/datatype/PreValues.cs
@@ -8,7 +8,6 @@ using System.Runtime.CompilerServices;
 using umbraco.DataLayer;
 using umbraco.BusinessLogic;
 
-
 namespace umbraco.cms.businesslogic.datatype
 {
     /// <summary>
@@ -17,11 +16,6 @@ namespace umbraco.cms.businesslogic.datatype
     [Obsolete("This class is no longer used and will be removed from the codebase in the future.")]
     public class PreValues
     {
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
         /// <summary>
         /// Gets the pre values collection.
         /// </summary>
@@ -30,18 +24,20 @@ namespace umbraco.cms.businesslogic.datatype
         public static SortedList GetPreValues(int DataTypeId)
         {
             var retval = new SortedList();
-            var dr = SqlHelper.ExecuteReader(
-                "Select id, sortorder, [value], alias from cmsDataTypePreValues where DataTypeNodeId = @dataTypeId order by sortorder",
-                SqlHelper.CreateParameter("@dataTypeId", DataTypeId));
-
-            int counter = 0;
-            while (dr.Read())
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(
+                "select id, sortorder, [value], alias from cmsDataTypePreValues where DataTypeNodeId = @dataTypeId order by sortorder",
+                sqlHelper.CreateParameter("@dataTypeId", DataTypeId)))
             {
-                retval.Add(counter, new PreValue(dr.GetInt("id"), dr.GetInt("sortorder"), dr.GetString("value"), dr.GetString("alias")));
-                counter++;
+                var counter = 0;
+                while (dr.Read())
+                {
+                    retval.Add(counter, new PreValue(dr.GetInt("id"), dr.GetInt("sortorder"), dr.GetString("value"), dr.GetString("alias")));
+
+                    counter++;
+                }
+                return retval;
             }
-            dr.Close();
-            return retval;
         }
 
         /// <summary>
@@ -50,8 +46,9 @@ namespace umbraco.cms.businesslogic.datatype
         /// <param name="dataTypeDefId"></param>
         public static void DeleteByDataTypeDefinition(int dataTypeDefId)
         {
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",
-                SqlHelper.CreateParameter("@dtdefid", dataTypeDefId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",
+                sqlHelper.CreateParameter("@dtdefid", dataTypeDefId));
         }
 
         /// <summary>
@@ -61,12 +58,10 @@ namespace umbraco.cms.businesslogic.datatype
         /// <returns></returns>
         public static int CountOfPreValues(int dataTypeDefId)
         {
-            return SqlHelper.ExecuteScalar<int>(
-                "select count(id) from cmsDataTypePreValues where dataTypeNodeId = @dataTypeId",
-                SqlHelper.CreateParameter("@dataTypeId", dataTypeDefId));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>(
+                    "select count(id) from cmsDataTypePreValues where dataTypeNodeId = @dataTypeId",
+                    sqlHelper.CreateParameter("@dataTypeId", dataTypeDefId));
         }
-
     }
-
-   
-}
+}
\ No newline at end of file
diff --git a/src/umbraco.cms/businesslogic/language/Item.cs b/src/umbraco.cms/businesslogic/language/Item.cs
index 7c519b776f..6898cbc895 100644
--- a/src/umbraco.cms/businesslogic/language/Item.cs
+++ b/src/umbraco.cms/businesslogic/language/Item.cs
@@ -20,11 +20,9 @@ namespace umbraco.cms.businesslogic.language
     [Obsolete("This class is no longer used, nor should it ever be used, it will be removed from the codebase in future versions")]
     public class Item
     {
-
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
diff --git a/src/umbraco.cms/businesslogic/language/Language.cs b/src/umbraco.cms/businesslogic/language/Language.cs
index c5badc001b..e51817a577 100644
--- a/src/umbraco.cms/businesslogic/language/Language.cs
+++ b/src/umbraco.cms/businesslogic/language/Language.cs
@@ -36,9 +36,8 @@ namespace umbraco.cms.businesslogic.language
         #region Constants and static members
         
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
diff --git a/src/umbraco.cms/businesslogic/macro/Macro.cs b/src/umbraco.cms/businesslogic/macro/Macro.cs
index 4031f54150..0b043a90a3 100644
--- a/src/umbraco.cms/businesslogic/macro/Macro.cs
+++ b/src/umbraco.cms/businesslogic/macro/Macro.cs
@@ -31,7 +31,11 @@ namespace umbraco.cms.businesslogic.macro
 	{
         //initialize empty model
 	    internal IMacro MacroEntity = new Umbraco.Core.Models.Macro();
-
+        
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
index 3535104063..ff3a58d46a 100644
--- a/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
+++ b/src/umbraco.cms/businesslogic/macro/MacroProperty.cs
@@ -22,6 +22,10 @@ namespace umbraco.cms.businesslogic.macro
     [Obsolete("This is no longer used, use the IMacroService and related models instead")]
     public class MacroProperty
     {
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -142,7 +146,8 @@ namespace umbraco.cms.businesslogic.macro
 
         private void Setup()
         {
-            using (var dr = SqlHelper.ExecuteReader("select macro, editorAlias, macroPropertySortOrder, macroPropertyAlias, macroPropertyName from cmsMacroProperty where id = @id", SqlHelper.CreateParameter("@id", Id)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader("select macro, editorAlias, macroPropertySortOrder, macroPropertyAlias, macroPropertyName from cmsMacroProperty where id = @id", sqlHelper.CreateParameter("@id", Id)))
             {
                 if (dr.Read())
                 {
@@ -165,7 +170,8 @@ namespace umbraco.cms.businesslogic.macro
         /// </summary>
         public void Delete()
         {
-            SqlHelper.ExecuteNonQuery("delete from cmsMacroProperty where id = @id", SqlHelper.CreateParameter("@id", this.Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsMacroProperty where id = @id", sqlHelper.CreateParameter("@id", this.Id));
         }
 
         public void Save()
@@ -174,19 +180,19 @@ namespace umbraco.cms.businesslogic.macro
             {
                 MacroProperty mp = MakeNew(Macro, Alias, Name, ParameterEditorAlias);
                 Id = mp.Id;
-
             }
             else
             {
-                SqlHelper.ExecuteNonQuery("UPDATE cmsMacroProperty set macro = @macro, " +
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("UPDATE cmsMacroProperty set macro = @macro, " +
                                           "macropropertyAlias = @alias, macroPropertyName = @name, " +
                                           "editorAlias = @editorAlias, macroPropertySortOrder = @so WHERE id = @id",
-                                          SqlHelper.CreateParameter("@id", Id),
-                                          SqlHelper.CreateParameter("@macro", Macro.Id),
-                                          SqlHelper.CreateParameter("@alias", Alias),
-                                          SqlHelper.CreateParameter("@name", Name),
-                                          SqlHelper.CreateParameter("@editorAlias", ParameterEditorAlias),
-                                          SqlHelper.CreateParameter("@so", SortOrder));
+                                          sqlHelper.CreateParameter("@id", Id),
+                                          sqlHelper.CreateParameter("@macro", Macro.Id),
+                                          sqlHelper.CreateParameter("@alias", Alias),
+                                          sqlHelper.CreateParameter("@name", Name),
+                                          sqlHelper.CreateParameter("@editorAlias", ParameterEditorAlias),
+                                          sqlHelper.CreateParameter("@so", SortOrder));
             }
         }
 
@@ -216,7 +222,8 @@ namespace umbraco.cms.businesslogic.macro
         public static MacroProperty[] GetProperties(int macroId)
         {
             var props = new List<MacroProperty>();
-            using (IRecordsReader dr = SqlHelper.ExecuteReader("select id from cmsMacroProperty where macro = @macroId order by macroPropertySortOrder, id ASC", SqlHelper.CreateParameter("@macroId", macroId)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("select id from cmsMacroProperty where macro = @macroId order by macroPropertySortOrder, id ASC", sqlHelper.CreateParameter("@macroId", macroId)))
             {                
                 while (dr.Read())
                 {
@@ -244,7 +251,6 @@ namespace umbraco.cms.businesslogic.macro
         [MethodImpl(MethodImplOptions.Synchronized)]
         public static MacroProperty MakeNew(Macro macro, string alias, string name, string editorAlias)
         {
-
             //try to get the new mapped parameter editor
             var mapped = LegacyParameterEditorAliasConverter.GetNewAliasFromLegacyAlias(editorAlias, false);
             if (mapped.IsNullOrWhiteSpace() == false)
@@ -254,13 +260,17 @@ namespace umbraco.cms.businesslogic.macro
 
             int macroPropertyId = 0;
             // The method is synchronized
-            SqlHelper.ExecuteNonQuery("INSERT INTO cmsMacroProperty (macro, macropropertyAlias, macroPropertyName, editorAlias) VALUES (@macro, @alias, @name, @editorAlias)",
-                SqlHelper.CreateParameter("@macro", macro.Id),
-                SqlHelper.CreateParameter("@alias", alias),
-                SqlHelper.CreateParameter("@name", name),
-                SqlHelper.CreateParameter("@editorAlias", editorAlias));
-            macroPropertyId = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsMacroProperty");
-            return new MacroProperty(macroPropertyId);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                sqlHelper.ExecuteNonQuery(
+                    "INSERT INTO cmsMacroProperty (macro, macropropertyAlias, macroPropertyName, editorAlias) VALUES (@macro, @alias, @name, @editorAlias)",
+                    sqlHelper.CreateParameter("@macro", macro.Id),
+                    sqlHelper.CreateParameter("@alias", alias),
+                    sqlHelper.CreateParameter("@name", name),
+                    sqlHelper.CreateParameter("@editorAlias", editorAlias));
+                macroPropertyId = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsMacroProperty");
+                return new MacroProperty(macroPropertyId);
+            }
         }
 
         #endregion
diff --git a/src/umbraco.cms/businesslogic/macro/macroPropertyType.cs b/src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
index 85f4ac165e..8767d794c8 100644
--- a/src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
+++ b/src/umbraco.cms/businesslogic/macro/macroPropertyType.cs
@@ -13,6 +13,10 @@ namespace umbraco.cms.businesslogic.macro
     [Obsolete("This class is no longer used, the cmsMacroPropertyType has been removed, all methods will return empty collections and not perform any functions")]
     public class MacroPropertyType
     {
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/member/Member.cs b/src/umbraco.cms/businesslogic/member/Member.cs
index 6e4425a11c..71c8eda701 100644
--- a/src/umbraco.cms/businesslogic/member/Member.cs
+++ b/src/umbraco.cms/businesslogic/member/Member.cs
@@ -130,14 +130,16 @@ namespace umbraco.cms.businesslogic.member
             // changing how the members are shown and not having to worry about letters.
 
             var ids = new List<int>();
-            using (var dr = SqlHelper.ExecuteReader(
+
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(
                                         string.Format(_sQLOptimizedMany.Trim(), "LOWER(SUBSTRING(text, 1, 1)) NOT IN ('a','b','c','d','e','f','g','h','i','j','k','l','m','n','o','p','q','r','s','t','u','v','w','x','y','z')", "umbracoNode.text"),
-                                            SqlHelper.CreateParameter("@nodeObjectType", Member._objectType)))
+                                            sqlHelper.CreateParameter("@nodeObjectType", Member._objectType)))
             {
-                
+
                 while (dr.Read())
                 {
-                    ids.Add(dr.GetInt("id"));                    
+                    ids.Add(dr.GetInt("id"));
                 }
             }
 
@@ -219,7 +221,7 @@ namespace umbraco.cms.businesslogic.member
         /// <returns>The new member</returns>
         public static Member MakeNew(string Name, string LoginName, string Email, MemberType mbt, User u)
         {
-            if (mbt == null) throw new ArgumentNullException("mbt");            
+            if (mbt == null) throw new ArgumentNullException("mbt");
             var loginName = (string.IsNullOrEmpty(LoginName) == false) ? LoginName : Name;
 
             var provider = MembershipProviderExtensions.GetMembersMembershipProvider();
@@ -243,7 +245,7 @@ namespace umbraco.cms.businesslogic.member
             var e = new NewEventArgs();
 
             legacy.OnNew(e);
-            
+
             legacy.Save();
 
             return legacy;
@@ -339,19 +341,22 @@ namespace umbraco.cms.businesslogic.member
         [Obsolete("This method will not work if the password format is encrypted since the encryption that is performed is not static and a new value will be created each time the same string is encrypted")]
         public static Member GetMemberFromLoginAndEncodedPassword(string loginName, string password)
         {
-            var o = SqlHelper.ExecuteScalar<object>(
-                "select nodeID from cmsMember where LoginName = @loginName and Password = @password",
-                SqlHelper.CreateParameter("loginName", loginName),
-                SqlHelper.CreateParameter("password", password));
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                var o = sqlHelper.ExecuteScalar<object>(
+                    "select nodeID from cmsMember where LoginName = @loginName and Password = @password",
+                    sqlHelper.CreateParameter("loginName", loginName),
+                    sqlHelper.CreateParameter("password", password));
 
-            if (o == null)
-                return null;
+                if (o == null)
+                    return null;
 
-            int tmpId;
-            if (!int.TryParse(o.ToString(), out tmpId))
-                return null;
+                int tmpId;
+                if (!int.TryParse(o.ToString(), out tmpId))
+                    return null;
 
-            return new Member(tmpId);
+                return new Member(tmpId);
+            }
         }
 
         [Obsolete("Use MembershipProviderExtensions.IsUmbracoMembershipProvider instead")]
@@ -596,7 +601,7 @@ namespace umbraco.cms.businesslogic.member
             var e = new SaveEventArgs();
             if (raiseEvents)
             {
-                FireBeforeSave(e);    
+                FireBeforeSave(e);
             }
 
             foreach (var property in GenericProperties)
@@ -614,7 +619,7 @@ namespace umbraco.cms.businesslogic.member
 
                 if (raiseEvents)
                 {
-                    FireAfterSave(e);    
+                    FireAfterSave(e);
                 }
             }
         }
@@ -638,16 +643,16 @@ namespace umbraco.cms.businesslogic.member
             var x = base.ToXml(xd, Deep);
             if (x.Attributes != null && x.Attributes["loginName"] == null)
             {
-                x.Attributes.Append(XmlHelper.AddAttribute(xd, "loginName", LoginName));                
+                x.Attributes.Append(XmlHelper.AddAttribute(xd, "loginName", LoginName));
             }
             if (x.Attributes != null && x.Attributes["email"] == null)
             {
-                x.Attributes.Append(XmlHelper.AddAttribute(xd, "email", Email));    
+                x.Attributes.Append(XmlHelper.AddAttribute(xd, "email", Email));
             }
             if (x.Attributes != null && x.Attributes["key"] == null)
             {
-                x.Attributes.Append(XmlHelper.AddAttribute(xd, "key", UniqueId.ToString()));   
-            }                       
+                x.Attributes.Append(XmlHelper.AddAttribute(xd, "key", UniqueId.ToString()));
+            }
             return x;
         }
 
@@ -686,7 +691,7 @@ namespace umbraco.cms.businesslogic.member
         /// <param name="newPassword"></param>
         public void ChangePassword(string newPassword)
         {
-            MemberItem.RawPasswordValue = newPassword;            
+            MemberItem.RawPasswordValue = newPassword;
         }
 
         /// <summary>
@@ -711,13 +716,17 @@ namespace umbraco.cms.businesslogic.member
 
             if (!e.Cancel)
             {
-                var parameters = new IParameter[] { SqlHelper.CreateParameter("@id", Id),
-                                                         SqlHelper.CreateParameter("@groupId", GroupId) };
-                bool exists = SqlHelper.ExecuteScalar<int>("SELECT COUNT(member) FROM cmsMember2MemberGroup WHERE member = @id AND memberGroup = @groupId",
-                                                           parameters) > 0;
-                if (!exists)
-                    SqlHelper.ExecuteNonQuery("INSERT INTO cmsMember2MemberGroup (member, memberGroup) values (@id, @groupId)",
-                                              parameters);
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    var parameters = new IParameter[] { sqlHelper.CreateParameter("@id", Id),
+                                                             sqlHelper.CreateParameter("@groupId", GroupId) };
+                    bool exists = sqlHelper.ExecuteScalar<int>("SELECT COUNT(member) FROM cmsMember2MemberGroup WHERE member = @id AND memberGroup = @groupId",
+                                                               parameters) > 0;
+                    if (!exists)
+                        sqlHelper.ExecuteNonQuery("INSERT INTO cmsMember2MemberGroup (member, memberGroup) values (@id, @groupId)",
+                                                  parameters);
+                }
+
                 PopulateGroups();
 
                 FireAfterAddGroup(e);
@@ -736,9 +745,10 @@ namespace umbraco.cms.businesslogic.member
 
             if (!e.Cancel)
             {
-                SqlHelper.ExecuteNonQuery(
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
                     "delete from cmsMember2MemberGroup where member = @id and Membergroup = @groupId",
-                    SqlHelper.CreateParameter("@id", Id), SqlHelper.CreateParameter("@groupId", GroupId));
+                    sqlHelper.CreateParameter("@id", Id), sqlHelper.CreateParameter("@groupId", GroupId));
                 PopulateGroups();
                 FireAfterRemoveGroup(e);
             }
@@ -762,9 +772,11 @@ namespace umbraco.cms.businesslogic.member
         private void PopulateGroups()
         {
             var temp = new Hashtable();
-            using (var dr = SqlHelper.ExecuteReader(
+
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(
                 "select memberGroup from cmsMember2MemberGroup where member = @id",
-                SqlHelper.CreateParameter("@id", Id)))
+                sqlHelper.CreateParameter("@id", Id)))
             {
                 while (dr.Read())
                     temp.Add(dr.GetInt("memberGroup"),
@@ -821,16 +833,16 @@ namespace umbraco.cms.businesslogic.member
                     //cache the member
                     var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem<Member>(
                         GetCacheKey(m.Id),
-                        timeout:        TimeSpan.FromMinutes(30),
-                        getCacheItem:   () =>
-                        {
+                        timeout: TimeSpan.FromMinutes(30),
+                        getCacheItem: () =>
+                      {
                             // Debug information
                             HttpContext.Current.Trace.Write("member",
-                                                            string.Format("Member added to cache: {0}/{1} ({2})",
-                                                                          m.Text, m.LoginName, m.Id));
+                                                          string.Format("Member added to cache: {0}/{1} ({2})",
+                                                                        m.Text, m.LoginName, m.Id));
 
-                            return m;
-                        });
+                          return m;
+                      });
 
                     m.FireAfterAddToCache(e);
                 }
@@ -870,16 +882,16 @@ namespace umbraco.cms.businesslogic.member
                     //cache the member
                     var cachedMember = ApplicationContext.Current.ApplicationCache.RuntimeCache.GetCacheItem<Member>(
                         GetCacheKey(m.Id),
-                        timeout:        TimeSpan.FromMinutes(30),
-                        getCacheItem:   () =>
-                        {
+                        timeout: TimeSpan.FromMinutes(30),
+                        getCacheItem: () =>
+                      {
                             // Debug information
                             HttpContext.Current.Trace.Write("member",
-                                                            string.Format("Member added to cache: {0}/{1} ({2})",
-                                                                          m.Text, m.LoginName, m.Id));
+                                                          string.Format("Member added to cache: {0}/{1} ({2})",
+                                                                        m.Text, m.LoginName, m.Id));
 
-                            return m;
-                        });
+                          return m;
+                      });
 
                     m.FireAfterAddToCache(e);
                 }
diff --git a/src/umbraco.cms/businesslogic/member/MemberGroup.cs b/src/umbraco.cms/businesslogic/member/MemberGroup.cs
index eab3dd4aea..b67c8a3012 100644
--- a/src/umbraco.cms/businesslogic/member/MemberGroup.cs
+++ b/src/umbraco.cms/businesslogic/member/MemberGroup.cs
@@ -5,6 +5,7 @@ using Umbraco.Core.Models;
 using Umbraco.Core.Persistence.Querying;
 using umbraco.DataLayer;
 using System.Collections;
+using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core;
 
@@ -136,9 +137,10 @@ namespace umbraco.cms.businesslogic.member
 
 	    public bool HasMember(int memberId)
 	    {
-	        return SqlHelper.ExecuteScalar<int>("select count(member) from cmsMember2MemberGroup where member = @member and memberGroup = @memberGroup",
-	            SqlHelper.CreateParameter("@member", memberId),
-	            SqlHelper.CreateParameter("@memberGroup", Id)) > 0;
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<int>("select count(member) from cmsMember2MemberGroup where member = @member and memberGroup = @memberGroup",
+	            sqlHelper.CreateParameter("@member", memberId),
+	            sqlHelper.CreateParameter("@memberGroup", Id)) > 0;
 	    }
 
 	    /// <summary>
diff --git a/src/umbraco.cms/businesslogic/propertytype/PropertyTypeGroup.cs b/src/umbraco.cms/businesslogic/propertytype/PropertyTypeGroup.cs
index a92e18800a..c2e576cd3f 100644
--- a/src/umbraco.cms/businesslogic/propertytype/PropertyTypeGroup.cs
+++ b/src/umbraco.cms/businesslogic/propertytype/PropertyTypeGroup.cs
@@ -55,41 +55,46 @@ namespace umbraco.cms.businesslogic.propertytype
         {
             if (Id != 0)
             {
-                SqlHelper.ExecuteNonQuery(
-                    @"UPDATE 
-                        cmsPropertyTypeGroup 
-                    SET 
-                        contenttypeNodeId = @contentTypeId,
-                        sortOrder = @sortOrder,                        
-                        text = @name
-                    WHERE
-                        id = @id
-                ",
-                    SqlHelper.CreateParameter("@id", Id),
-                    SqlHelper.CreateParameter("@contentTypeId", ContentTypeId),
-                    SqlHelper.CreateParameter("@sortOrder", SortOrder),
-                    SqlHelper.CreateParameter("@name", Name)
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
+                        @"UPDATE 
+                            cmsPropertyTypeGroup 
+                        SET 
+                            contenttypeNodeId = @contentTypeId,
+                            sortOrder = @sortOrder,                        
+                            text = @name
+                        WHERE
+                            id = @id
+                    ",
+                        sqlHelper.CreateParameter("@id", Id),
+                        sqlHelper.CreateParameter("@contentTypeId", ContentTypeId),
+                        sqlHelper.CreateParameter("@sortOrder", SortOrder),
+                        sqlHelper.CreateParameter("@name", Name)
                     );
             }
             else
             {
                 if (SortOrder == -1)
-                    SortOrder = SqlHelper.ExecuteScalar<int>("select count(*) from cmsPropertyTypeGroup where contenttypeNodeId = @nodeId",
-                        SqlHelper.CreateParameter("@nodeId", ContentTypeId)) + 1;
+                    using (var sqlHelper = Application.SqlHelper)
+                        SortOrder = sqlHelper.ExecuteScalar<int>("select count(*) from cmsPropertyTypeGroup where contenttypeNodeId = @nodeId",
+                        sqlHelper.CreateParameter("@nodeId", ContentTypeId)) + 1;
 
-                SqlHelper.ExecuteNonQuery(
-                    @"
-                    INSERT INTO 
-                        cmsPropertyTypeGroup
-                        (contenttypeNodeId, sortOrder, text)
-                    VALUES 
-                        (@contentTypeId, @sortOrder, @name)
-                ",
-                    SqlHelper.CreateParameter("@contentTypeId", ContentTypeId),
-                    SqlHelper.CreateParameter("@sortOrder", SortOrder),
-                    SqlHelper.CreateParameter("@name", Name)
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
+                        @"
+                        INSERT INTO 
+                            cmsPropertyTypeGroup
+                            (contenttypeNodeId, sortOrder, text)
+                        VALUES 
+                            (@contentTypeId, @sortOrder, @name)
+                    ",
+                        sqlHelper.CreateParameter("@contentTypeId", ContentTypeId),
+                        sqlHelper.CreateParameter("@sortOrder", SortOrder),
+                        sqlHelper.CreateParameter("@name", Name)
                     );
-                Id = SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM [cmsPropertyTypeGroup]");
+
+                using (var sqlHelper = Application.SqlHelper)
+                    Id = sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM [cmsPropertyTypeGroup]");
 
             }
         }
@@ -106,12 +111,14 @@ namespace umbraco.cms.businesslogic.propertytype
             foreach (var ptg in GetPropertyTypeGroups())
                 ptg.Delete();
 
-            SqlHelper.ExecuteNonQuery("DELETE FROM cmsPropertyTypeGroup WHERE id = @id", SqlHelper.CreateParameter("@id", Id));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("DELETE FROM cmsPropertyTypeGroup WHERE id = @id", sqlHelper.CreateParameter("@id", Id));
         }
 
         internal void Load()
         {
-            using (var dr = SqlHelper.ExecuteReader(@" SELECT contenttypeNodeId, sortOrder, text FROM cmsPropertyTypeGroup WHERE id = @id", SqlHelper.CreateParameter("@id", Id)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(@" SELECT contenttypeNodeId, sortOrder, text FROM cmsPropertyTypeGroup WHERE id = @id", sqlHelper.CreateParameter("@id", Id)))
             {
                 if (dr.Read())
                 {
@@ -132,7 +139,8 @@ namespace umbraco.cms.businesslogic.propertytype
         public static IEnumerable<PropertyTypeGroup> GetPropertyTypeGroupsFromContentType(int contentTypeId)
         {
             var ptgs = new List<PropertyTypeGroup>();
-            using (var dr = SqlHelper.ExecuteReader(@" SELECT id FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @contentTypeId", SqlHelper.CreateParameter("@contentTypeId", contentTypeId)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (var dr = sqlHelper.ExecuteReader(@" SELECT id FROM cmsPropertyTypeGroup WHERE contenttypeNodeId = @contentTypeId", sqlHelper.CreateParameter("@contentTypeId", contentTypeId)))
             {
                 while (dr.Read())
                 {
@@ -144,9 +152,9 @@ namespace umbraco.cms.businesslogic.propertytype
         }
 
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs
index 8ffaa5d11a..b9622d7c91 100644
--- a/src/umbraco.cms/businesslogic/propertytype/propertytype.cs
+++ b/src/umbraco.cms/businesslogic/propertytype/propertytype.cs
@@ -41,6 +41,10 @@ namespace umbraco.cms.businesslogic.propertytype
 
         #endregion
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -50,20 +54,24 @@ namespace umbraco.cms.businesslogic.propertytype
 
         public PropertyType(int id)
         {
-            using (IRecordsReader dr = SqlHelper.ExecuteReader(
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(
                 "Select mandatory, DataTypeId, propertyTypeGroupId, ContentTypeId, sortOrder, alias, name, validationRegExp, description from cmsPropertyType where id=@id",
-                SqlHelper.CreateParameter("@id", id)))
+                sqlHelper.CreateParameter("@id", id)))
             {
                 if (!dr.Read())
                     throw new ArgumentException("Propertytype with id: " + id + " doesnt exist!");
+
                 _mandatory = dr.GetBoolean("mandatory");
                 _id = id;
+
                 if (!dr.IsNull("propertyTypeGroupId"))
                 {
                     _propertyTypeGroup = dr.GetInt("propertyTypeGroupId");
                     //TODO: Remove after refactoring!
                     _tabId = _propertyTypeGroup;
                 }
+
                 _sortOrder = dr.GetInt("sortOrder");
                 _alias = dr.GetString("alias");
                 _name = dr.GetString("Name");
@@ -85,8 +93,9 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _DataTypeId = value.Id;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "Update cmsPropertyType set DataTypeId = " + value.Id + " where id=" + Id);
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
+                        "Update cmsPropertyType set DataTypeId = " + value.Id + " where id=" + Id);
             }
         }
 
@@ -125,9 +134,11 @@ namespace umbraco.cms.businesslogic.propertytype
                 {
                     dbPropertyTypeGroup = DBNull.Value;
                 }
-                SqlHelper.ExecuteNonQuery("Update cmsPropertyType set propertyTypeGroupId = @propertyTypeGroupId where id = @id",
-                              SqlHelper.CreateParameter("@propertyTypeGroupId", dbPropertyTypeGroup),
-                              SqlHelper.CreateParameter("@id", Id));
+
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set propertyTypeGroupId = @propertyTypeGroupId where id = @id",
+                              sqlHelper.CreateParameter("@propertyTypeGroupId", dbPropertyTypeGroup),
+                              sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -138,10 +149,10 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _mandatory = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "Update cmsPropertyType set mandatory = @mandatory where id = @id",
-                    SqlHelper.CreateParameter("@mandatory", value),
-                    SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set mandatory = @mandatory where id = @id",
+                        sqlHelper.CreateParameter("@mandatory", value),
+                        sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -152,9 +163,9 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _validationRegExp = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "Update cmsPropertyType set validationRegExp = @validationRegExp where id = @id",
-                    SqlHelper.CreateParameter("@validationRegExp", value), SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set validationRegExp = @validationRegExp where id = @id",
+                        sqlHelper.CreateParameter("@validationRegExp", value), sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -189,10 +200,10 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _description = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "Update cmsPropertyType set description = @description where id = @id",
-                    SqlHelper.CreateParameter("@description", value),
-                    SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set description = @description where id = @id",
+                        sqlHelper.CreateParameter("@description", value),
+                        sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -203,10 +214,10 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _sortOrder = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "Update cmsPropertyType set sortOrder = @sortOrder where id = @id",
-                    SqlHelper.CreateParameter("@sortOrder", value),
-                    SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set sortOrder = @sortOrder where id = @id",
+                        sqlHelper.CreateParameter("@sortOrder", value),
+                        sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -217,9 +228,10 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _alias = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery("Update cmsPropertyType set alias = @alias where id= @id",
-                                          SqlHelper.CreateParameter("@alias", Casing.SafeAliasWithForcingCheck(_alias)),
-                                          SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("Update cmsPropertyType set alias = @alias where id= @id",
+                        sqlHelper.CreateParameter("@alias", Casing.SafeAliasWithForcingCheck(_alias)),
+                        sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -253,10 +265,11 @@ namespace umbraco.cms.businesslogic.propertytype
             {
                 _name = value;
                 InvalidateCache();
-                SqlHelper.ExecuteNonQuery(
-                    "UPDATE cmsPropertyType SET name=@name WHERE id=@id",
-                    SqlHelper.CreateParameter("@name", _name),
-                    SqlHelper.CreateParameter("@id", Id));
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
+                        "UPDATE cmsPropertyType SET name=@name WHERE id=@id",
+                        sqlHelper.CreateParameter("@name", _name),
+                        sqlHelper.CreateParameter("@id", Id));
             }
         }
 
@@ -289,17 +302,18 @@ namespace umbraco.cms.businesslogic.propertytype
             try
             {
                 // The method is synchronized, but we'll still look it up with an additional parameter (alias)
-                SqlHelper.ExecuteNonQuery(
-                    "INSERT INTO cmsPropertyType (DataTypeId, ContentTypeId, alias, name) VALUES (@DataTypeId, @ContentTypeId, @alias, @name)",
-                    SqlHelper.CreateParameter("@DataTypeId", dt.Id),
-                    SqlHelper.CreateParameter("@ContentTypeId", ct.Id),
-                    SqlHelper.CreateParameter("@alias", alias),
-                    SqlHelper.CreateParameter("@name", name));
-                pt =
-                    new PropertyType(
-                        SqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsPropertyType WHERE alias=@alias",
-                                                     SqlHelper.CreateParameter("@alias", alias)));
-            }
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery(
+                        "INSERT INTO cmsPropertyType (DataTypeId, ContentTypeId, alias, name) VALUES (@DataTypeId, @ContentTypeId, @alias, @name)",
+                        sqlHelper.CreateParameter("@DataTypeId", dt.Id),
+                        sqlHelper.CreateParameter("@ContentTypeId", ct.Id),
+                        sqlHelper.CreateParameter("@alias", alias),
+                        sqlHelper.CreateParameter("@name", name));
+
+                using (var sqlHelper = Application.SqlHelper)
+                    pt = new PropertyType(sqlHelper.ExecuteScalar<int>("SELECT MAX(id) FROM cmsPropertyType WHERE alias=@alias",
+                            sqlHelper.CreateParameter("@alias", alias)));
+                }
             finally
             {
                 // Clear cached items
@@ -317,8 +331,9 @@ namespace umbraco.cms.businesslogic.propertytype
         public static IEnumerable<PropertyType> GetPropertyTypes()
         {
             var result = new List<PropertyType>();
-            using (IRecordsReader dr =
-                SqlHelper.ExecuteReader("select id from cmsPropertyType order by Name"))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = 
+                sqlHelper.ExecuteReader("select id from cmsPropertyType order by Name"))
             {
                 while (dr.Read())
                 {
@@ -338,9 +353,10 @@ namespace umbraco.cms.businesslogic.propertytype
 		public static IEnumerable<PropertyType> GetPropertyTypesByGroup(int groupId)
         {
             var result = new List<PropertyType>();
-            using (IRecordsReader dr =
-                SqlHelper.ExecuteReader("SELECT id FROM cmsPropertyType WHERE propertyTypeGroupId = @groupId order by SortOrder",
-                    SqlHelper.CreateParameter("@groupId", groupId)))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = 
+                sqlHelper.ExecuteReader("SELECT id FROM cmsPropertyType WHERE propertyTypeGroupId = @groupId order by SortOrder",
+                    sqlHelper.CreateParameter("@groupId", groupId)))
             {
                 while (dr.Read())
                 {
@@ -360,10 +376,11 @@ namespace umbraco.cms.businesslogic.propertytype
         public static IEnumerable<PropertyType> GetByDataTypeDefinition(int dataTypeDefId)
         {
             var result = new List<PropertyType>();
-            using (IRecordsReader dr =
-                SqlHelper.ExecuteReader(
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = 
+                sqlHelper.ExecuteReader(
                     "select id, Name from cmsPropertyType where dataTypeId=@dataTypeId order by Name",
-                    SqlHelper.CreateParameter("@dataTypeId", dataTypeDefId)))
+                    sqlHelper.CreateParameter("@dataTypeId", dataTypeDefId)))
             {
                 while (dr.Read())
                 {
@@ -384,10 +401,12 @@ namespace umbraco.cms.businesslogic.propertytype
             CleanPropertiesOnDeletion(_contenttypeid);
 
             //delete tag refs
-            SqlHelper.ExecuteNonQuery("Delete from cmsTagRelationship where propertyTypeId = " + Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsTagRelationship where propertyTypeId = " + Id);
 
             // Delete PropertyType ..
-            SqlHelper.ExecuteNonQuery("Delete from cmsPropertyType where id = " + Id);
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("Delete from cmsPropertyType where id = " + Id);
 
 
             // delete cache from either master (via tabid) or current contentype
@@ -416,17 +435,19 @@ namespace umbraco.cms.businesslogic.propertytype
 
             //Initially Content.getContentOfContentType() was called, but because this doesn't include members we resort to sql lookups and deletes
             var tmp = new List<int>();
-            IRecordsReader dr = SqlHelper.ExecuteReader("SELECT nodeId FROM cmsContent INNER JOIN umbracoNode ON cmsContent.nodeId = umbracoNode.id WHERE ContentType = " + contentTypeId + " ORDER BY umbracoNode.text ");
-            while (dr.Read()) tmp.Add(dr.GetInt("nodeId"));
-            dr.Close();
-
-            foreach (var contentId in tmp)
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("SELECT nodeId FROM cmsContent INNER JOIN umbracoNode ON cmsContent.nodeId = umbracoNode.id WHERE ContentType = @contentTypeId ORDER BY umbracoNode.text", sqlHelper.CreateParameter("contentTypeId", contentTypeId)))
             {
-                SqlHelper.ExecuteNonQuery("DELETE FROM cmsPropertyData WHERE PropertyTypeId =" + this.Id + " AND contentNodeId = " + contentId);
-            }
+                while (dr.Read()) tmp.Add(dr.GetInt("nodeId"));
 
-            // invalidate content type cache
-            ContentType.FlushFromCache(contentTypeId);
+                foreach (var contentId in tmp)
+                {
+                    sqlHelper.ExecuteNonQuery("DELETE FROM cmsPropertyData WHERE PropertyTypeId =" + this.Id + " AND contentNodeId = " + contentId);
+                }
+
+                // invalidate content type cache
+                ContentType.FlushFromCache(contentTypeId);
+            }
         }
 
         public IDataType GetEditControl(object value, bool isPostBack)
diff --git a/src/umbraco.cms/businesslogic/relation/Relation.cs b/src/umbraco.cms/businesslogic/relation/Relation.cs
index dd66cf5c4c..0b6db22f80 100644
--- a/src/umbraco.cms/businesslogic/relation/Relation.cs
+++ b/src/umbraco.cms/businesslogic/relation/Relation.cs
@@ -36,6 +36,10 @@ namespace umbraco.cms.businesslogic.relation
             RelationEntity = found;
         }
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/relation/RelationType.cs b/src/umbraco.cms/businesslogic/relation/RelationType.cs
index bedb51e440..50a8f704b6 100644
--- a/src/umbraco.cms/businesslogic/relation/RelationType.cs
+++ b/src/umbraco.cms/businesslogic/relation/RelationType.cs
@@ -23,12 +23,7 @@ namespace umbraco.cms.businesslogic.relation
 	    internal IRelationType RelationTypeEntity;
 
 		#endregion
-
-        private static ISqlHelper SqlHelper
-        {
-            get { return Application.SqlHelper; }
-        }
-
+        
 		#region Constructors
 
 	    /// <summary>
diff --git a/src/umbraco.cms/businesslogic/task/Task.cs b/src/umbraco.cms/businesslogic/task/Task.cs
index 294077370f..210f1998c2 100644
--- a/src/umbraco.cms/businesslogic/task/Task.cs
+++ b/src/umbraco.cms/businesslogic/task/Task.cs
@@ -136,9 +136,9 @@ namespace umbraco.cms.businesslogic.task
         }
 
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/task/TaskType.cs b/src/umbraco.cms/businesslogic/task/TaskType.cs
index ce21a2f85c..c02ddcfe88 100644
--- a/src/umbraco.cms/businesslogic/task/TaskType.cs
+++ b/src/umbraco.cms/businesslogic/task/TaskType.cs
@@ -51,6 +51,10 @@ namespace umbraco.cms.businesslogic.task
 
         #region Private/protected members
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
diff --git a/src/umbraco.cms/businesslogic/template/Template.cs b/src/umbraco.cms/businesslogic/template/Template.cs
index e78925bd60..8d4b72da63 100644
--- a/src/umbraco.cms/businesslogic/template/Template.cs
+++ b/src/umbraco.cms/businesslogic/template/Template.cs
@@ -357,7 +357,8 @@ namespace umbraco.cms.businesslogic.template
             if (!e.Cancel)
             {
                 //remove refs from documents
-                SqlHelper.ExecuteNonQuery("UPDATE cmsDocument SET templateId = NULL WHERE templateId = " + this.Id);
+                using (var sqlHelper = Application.SqlHelper)
+                    sqlHelper.ExecuteNonQuery("UPDATE cmsDocument SET templateId = NULL WHERE templateId = " + this.Id);
 
                 
                 ApplicationContext.Current.Services.FileService.DeleteTemplate(TemplateEntity.Alias);
diff --git a/src/umbraco.cms/businesslogic/web/Document.cs b/src/umbraco.cms/businesslogic/web/Document.cs
index 43f375671e..f0ca2230f1 100644
--- a/src/umbraco.cms/businesslogic/web/Document.cs
+++ b/src/umbraco.cms/businesslogic/web/Document.cs
@@ -432,20 +432,22 @@ namespace umbraco.cms.businesslogic.web
         public static void RegeneratePreviews()
         {
             XmlDocument xd = new XmlDocument();
-            IRecordsReader dr = SqlHelper.ExecuteReader("select nodeId from cmsDocument");
 
-            while (dr.Read())
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader("select nodeId from cmsDocument"))
             {
-                try
+                while (dr.Read())
                 {
-                    new Document(dr.GetInt("nodeId")).SaveXmlPreview(xd);
-                }
-                catch (Exception ee)
-                {
-					LogHelper.Error<Document>("Error generating preview xml", ee);
+                    try
+                    {
+                        new Document(dr.GetInt("nodeId")).SaveXmlPreview(xd);
+                    }
+                    catch (Exception ee)
+                    {
+                        LogHelper.Error<Document>("Error generating preview xml", ee);
+                    }
                 }
             }
-            dr.Close();
         }
 
         /// <summary>
@@ -1368,12 +1370,14 @@ namespace umbraco.cms.businesslogic.web
 
             string pathExp = childrenOnly ? Path + ",%" : Path;
 
-            IRecordsReader dr = SqlHelper.ExecuteReader(String.Format(SqlOptimizedForPreview, pathExp));
-            while (dr.Read())
-                nodes.Add(new CMSPreviewNode(dr.GetInt("id"), dr.GetGuid("versionId"), dr.GetInt("parentId"), dr.GetShort("level"), dr.GetInt("sortOrder"), dr.GetString("xml"), !dr.GetBoolean("published")));
-            dr.Close();
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader dr = sqlHelper.ExecuteReader(String.Format(SqlOptimizedForPreview, pathExp)))
+            {
+                while (dr.Read())
+                    nodes.Add(new CMSPreviewNode(dr.GetInt("id"), dr.GetGuid("versionId"), dr.GetInt("parentId"), dr.GetShort("level"), dr.GetInt("sortOrder"), dr.GetString("xml"), !dr.GetBoolean("published")));
 
-            return nodes;
+                return nodes;
+            }
         }
 
         public override XmlNode ToPreviewXml(XmlDocument xd)
@@ -1539,21 +1543,29 @@ namespace umbraco.cms.businesslogic.web
         [MethodImpl(MethodImplOptions.Synchronized)]
         private void saveXml(XmlNode x)
         {
-            bool exists = (SqlHelper.ExecuteScalar<int>("SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId=@nodeId",
-                                            SqlHelper.CreateParameter("@nodeId", Id)) != 0);
-            string sql = exists ? "UPDATE cmsContentXml SET xml = @xml WHERE nodeId=@nodeId"
-                                : "INSERT INTO cmsContentXml(nodeId, xml) VALUES (@nodeId, @xml)";
-            SqlHelper.ExecuteNonQuery(sql,
-                                      SqlHelper.CreateParameter("@nodeId", Id),
-                                      SqlHelper.CreateParameter("@xml", x.OuterXml));
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                bool exists = (sqlHelper.ExecuteScalar<int>(
+                                   "SELECT COUNT(nodeId) FROM cmsContentXml WHERE nodeId=@nodeId",
+                                   sqlHelper.CreateParameter("@nodeId", Id)) != 0);
+                string sql = exists ? "UPDATE cmsContentXml SET xml = @xml WHERE nodeId=@nodeId"
+                                    : "INSERT INTO cmsContentXml(nodeId, xml) VALUES (@nodeId, @xml)";
+           
+                sqlHelper.ExecuteNonQuery(sql,
+                    sqlHelper.CreateParameter("@nodeId", Id),
+                    sqlHelper.CreateParameter("@xml", x.OuterXml));
+            }
         }
 
         private XmlNode importXml()
         {
             XmlDocument xmlDoc = new XmlDocument();
-            XmlReader xmlRdr = SqlHelper.ExecuteXmlReader(string.Format(
-                                                       "select xml from cmsContentXml where nodeID = {0}", Id));
-            xmlDoc.Load(xmlRdr);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                using(var xmlRdr = sqlHelper.ExecuteXmlReader(string.Format(
+                                                            "select xml from cmsContentXml where nodeID = {0}", Id)))
+                    xmlDoc.Load(xmlRdr);
+            }
 
             return xmlDoc.FirstChild;
         }
diff --git a/src/umbraco.cms/businesslogic/web/DocumentType.cs b/src/umbraco.cms/businesslogic/web/DocumentType.cs
index 6451197b0e..7e90b29813 100644
--- a/src/umbraco.cms/businesslogic/web/DocumentType.cs
+++ b/src/umbraco.cms/businesslogic/web/DocumentType.cs
@@ -307,11 +307,12 @@ namespace umbraco.cms.businesslogic.web
                 foreach (var currentContentTypeId in currentContentTypeIds)
                 {
                     //get all the content item ids of the current content type
-                    using (var dr = SqlHelper.ExecuteReader(@"SELECT DISTINCT cmsDocument.nodeId FROM cmsDocument
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var dr = sqlHelper.ExecuteReader(@"SELECT DISTINCT cmsDocument.nodeId FROM cmsDocument
                                                         INNER JOIN cmsContent ON cmsContent.nodeId = cmsDocument.nodeId
                                                         INNER JOIN cmsContentType ON cmsContent.contentType = cmsContentType.nodeId
                                                         WHERE cmsContentType.nodeId = @contentTypeId AND cmsDocument.published = 1",
-                                                            SqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
+                                                            sqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
                     {
                         while (dr.Read())
                         {
@@ -321,8 +322,9 @@ namespace umbraco.cms.businesslogic.web
                     }
 
                     //lookup the child content types if there are any and add the ids to the content type ids array
-                    using (var reader = SqlHelper.ExecuteReader("SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId=@contentTypeId",
-                                                                SqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var reader = sqlHelper.ExecuteReader("SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId=@contentTypeId",
+                                                                sqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
                     {
                         while (reader.Read())
                         {
@@ -396,15 +398,17 @@ namespace umbraco.cms.businesslogic.web
                 foreach (var currentContentTypeId in currentContentTypeIds)
                 {
                     //Remove all items from the cmsContentXml table that are of this current content type
-                    SqlHelper.ExecuteNonQuery(@"DELETE FROM cmsContentXml WHERE nodeId IN
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery(@"DELETE FROM cmsContentXml WHERE nodeId IN
                                         (SELECT DISTINCT cmsContent.nodeId FROM cmsContent 
                                             INNER JOIN cmsContentType ON cmsContent.contentType = cmsContentType.nodeId 
                                             WHERE cmsContentType.nodeId = @contentTypeId)",
-                                              SqlHelper.CreateParameter("@contentTypeId", currentContentTypeId));
+                                              sqlHelper.CreateParameter("@contentTypeId", currentContentTypeId));
 
                     //lookup the child content types if there are any and add the ids to the content type ids array
-                    using (var reader = SqlHelper.ExecuteReader("SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId=@contentTypeId",
-                                                                SqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var reader = sqlHelper.ExecuteReader("SELECT childContentTypeId FROM cmsContentType2ContentType WHERE parentContentTypeId=@contentTypeId",
+                                                                sqlHelper.CreateParameter("@contentTypeId", currentContentTypeId)))
                     {                        
                         while (reader.Read())
                         {
diff --git a/src/umbraco.cms/businesslogic/workflow/Notification.cs b/src/umbraco.cms/businesslogic/workflow/Notification.cs
index a7f07b4bd5..c271ad3d3e 100644
--- a/src/umbraco.cms/businesslogic/workflow/Notification.cs
+++ b/src/umbraco.cms/businesslogic/workflow/Notification.cs
@@ -39,9 +39,8 @@ namespace umbraco.cms.businesslogic.workflow
         public char ActionId { get; private set; }
 
         /// <summary>
-        /// Gets the SQL helper.
+        /// Unused, please do not use
         /// </summary>
-        /// <value>The SQL helper.</value>
         [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
diff --git a/src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs b/src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
index cc191638dd..17a87de3ca 100644
--- a/src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
+++ b/src/umbraco.datalayer/SqlHelpers/MySql/MySqlInstaller.cs
@@ -116,7 +116,8 @@ namespace umbraco.DataLayer.SqlHelpers.MySql
         /// <returns>The MySQL major version number</returns>
         protected virtual int GetMySqlVersion()
         {
-            return int.Parse(SqlHelper.ExecuteScalar<string>("SELECT SUBSTRING(VERSION(),1,1)"));
+            using (var sqlHelper = SqlHelper)
+                return int.Parse(sqlHelper.ExecuteScalar<string>("SELECT SUBSTRING(VERSION(),1,1)"));
         }
 
         #endregion
diff --git a/src/umbraco.datalayer/SqlHelpers/SqlServer/SqlServerTableUtility.cs b/src/umbraco.datalayer/SqlHelpers/SqlServer/SqlServerTableUtility.cs
index 657cb608c1..6444e16f9b 100644
--- a/src/umbraco.datalayer/SqlHelpers/SqlServer/SqlServerTableUtility.cs
+++ b/src/umbraco.datalayer/SqlHelpers/SqlServer/SqlServerTableUtility.cs
@@ -35,13 +35,15 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer
             ITable table = null;
 
             // get name in correct casing
-            name = SqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
-                                                          SqlHelper.CreateParameter("name", name));
+            using (var sqlHelper = SqlHelper)
+                name = sqlHelper.ExecuteScalar<string>("SELECT name FROM sys.tables WHERE name=@name",
+                                                          sqlHelper.CreateParameter("name", name));
             if (name != null)
             {
                 table = new DefaultTable(name);
 
-                using (IRecordsReader reader = SqlHelper.ExecuteReader(
+                using (var sqlHelper = SqlHelper)
+                using (IRecordsReader reader = sqlHelper.ExecuteReader(
                         @"SELECT c.name AS Name, st.name AS DataType, c.max_length, c.is_nullable, c.is_identity
                           FROM sys.tables AS t
                             JOIN sys.columns AS c ON t.object_id = c.object_id
@@ -49,7 +51,7 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer
                             JOIN sys.types AS ty ON ty.user_type_id = c.user_type_id
                             JOIN sys.types st ON ty.system_type_id = st.user_type_id
                           WHERE t.name = @name
-                          ORDER BY c.column_id", SqlHelper.CreateParameter("name", name)))
+                          ORDER BY c.column_id", sqlHelper.CreateParameter("name", name)))
                 {
                     while (reader.Read())
                     {
@@ -110,7 +112,8 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer
 
             // create query
             StringBuilder createTableQuery = new StringBuilder();
-            createTableQuery.AppendFormat("CREATE TABLE [{0}] (", SqlHelper.EscapeString(table.Name));
+            using (var sqlHelper = SqlHelper)
+                createTableQuery.AppendFormat("CREATE TABLE [{0}] (", sqlHelper.EscapeString(table.Name));
 
             // add fields
             while (hasNext)
@@ -134,7 +137,8 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer
             // execute query
             try
             {
-                SqlHelper.ExecuteNonQuery(createTableQuery.ToString());
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(createTableQuery.ToString());
             }
             catch (Exception executeException)
             {
@@ -152,13 +156,15 @@ namespace umbraco.DataLayer.SqlHelpers.SqlServer
             Debug.Assert(table != null && field != null);
 
             StringBuilder addColumnQuery = new StringBuilder();
-            addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
-                                        SqlHelper.EscapeString(table.Name),
-                                        SqlHelper.EscapeString(field.Name),
-                                        SqlHelper.EscapeString(GetDatabaseType(field)));
+            using (var sqlHelper = SqlHelper)
+                addColumnQuery.AppendFormat("ALTER TABLE [{0}] ADD [{1}] {2}",
+                                        sqlHelper.EscapeString(table.Name),
+                                        sqlHelper.EscapeString(field.Name),
+                                        sqlHelper.EscapeString(GetDatabaseType(field)));
             try
             {
-                SqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
+                using (var sqlHelper = SqlHelper)
+                    sqlHelper.ExecuteNonQuery(addColumnQuery.ToString());
             }
             catch (Exception executeException)
             {
diff --git a/src/umbraco.datalayer/Utility/Installer/DefaultInstallerUtility.cs b/src/umbraco.datalayer/Utility/Installer/DefaultInstallerUtility.cs
index 102ebed580..0996d9878d 100644
--- a/src/umbraco.datalayer/Utility/Installer/DefaultInstallerUtility.cs
+++ b/src/umbraco.datalayer/Utility/Installer/DefaultInstallerUtility.cs
@@ -197,7 +197,8 @@ namespace umbraco.DataLayer.Utility.Installer
                 {
                     if(v.ExpectedRows > -1)
                     {
-                        using (var reader = SqlHelper.ExecuteReader(v.Sql))
+                        using (var sqlHelper = SqlHelper)
+                        using (var reader = sqlHelper.ExecuteReader(v.Sql))
                         {
                             var rowCount = 0;
                             while (reader.Read())
@@ -209,7 +210,8 @@ namespace umbraco.DataLayer.Utility.Installer
                     }
                     else
                     {
-                        SqlHelper.ExecuteNonQuery(v.Sql);
+                        using (var sqlHelper = SqlHelper)
+                            sqlHelper.ExecuteNonQuery(v.Sql);
                     }
 
                     //if (!String.IsNullOrEmpty(v.Table) && !String.IsNullOrEmpty(v.Field) && !String.IsNullOrEmpty(v.Value))
@@ -251,7 +253,8 @@ namespace umbraco.DataLayer.Utility.Installer
             {
                 string rawStatement = statement.Trim();
                 if (rawStatement.Length > 0)
-                    SqlHelper.ExecuteNonQuery(rawStatement);
+                    using (var sqlHelper = SqlHelper)
+                        sqlHelper.ExecuteNonQuery(rawStatement);
             }
         }
 
diff --git a/src/umbraco.editorControls/BaseDataType.cs b/src/umbraco.editorControls/BaseDataType.cs
index ce132d0784..ecdbce6e7c 100644
--- a/src/umbraco.editorControls/BaseDataType.cs
+++ b/src/umbraco.editorControls/BaseDataType.cs
@@ -7,26 +7,30 @@ namespace umbraco.editorControls
 {
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public abstract class BaseDataType
-	{
-		private int _datatypedefinitionid;
-		private string _datafield = "";
-		private DBTypes _DBType;
+    {
+        private int _datatypedefinitionid;
+        private string _datafield = "";
+        private DBTypes _DBType;
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
 
-		public BaseDataType()
-		{}
+        public BaseDataType()
+        { }
+
+        #region IDataType Members
+        public abstract Guid Id { get; }
+        public abstract string DataTypeName { get; }
+        public abstract interfaces.IDataEditor DataEditor { get; }
+        public abstract interfaces.IDataPrevalue PrevalueEditor { get; }
+        public abstract interfaces.IData Data { get; }
 
-		#region IDataType Members
-		public abstract  Guid Id {get;}
-		public abstract string DataTypeName{get;}
-		public abstract interfaces.IDataEditor DataEditor{get;}
-		public abstract interfaces.IDataPrevalue PrevalueEditor {get;}
-		public abstract interfaces.IData Data{get;}
-		
 		public int DataTypeDefinitionId {
 			set {
 				_datatypedefinitionid = value;
@@ -44,53 +48,57 @@ namespace umbraco.editorControls
 				return _DBType;
 			}
 			set {
-				_DBType = value;
-				 SqlHelper.ExecuteNonQuery("update cmsDataType set dbType = '" + value.ToString() + "' where nodeId = @datadefinitionid",
-                     SqlHelper.CreateParameter("@datadefinitionid",_datatypedefinitionid)).ToString();
-				
-			}
-		}
-		// Umbraco legacy - get the datafield - the columnname of the cmsPropertyData table
-		// where to find the data, since it's configurable - there is no way of telling if
-		// its a bit, nvarchar, ntext or datetime field.
-		// get it by lookup the value associated to the datatypedefinition id.
-		public string DataFieldName 
-		{
+                _DBType = value;
+                using (var sqlHelper = Application.SqlHelper)
+				 sqlHelper.ExecuteNonQuery("update cmsDataType set dbType = '" + value.ToString() + "' where nodeId = @datadefinitionid",
+                     sqlHelper.CreateParameter("@datadefinitionid",_datatypedefinitionid)).ToString();
+            }
+        }
+        // Umbraco legacy - get the datafield - the columnname of the cmsPropertyData table
+        // where to find the data, since it's configurable - there is no way of telling if
+        // its a bit, nvarchar, ntext or datetime field.
+        // get it by lookup the value associated to the datatypedefinition id.
+        public string DataFieldName
+        {
 			get {
-				if (_datafield == "") 
-				{
-					string dbtypestr = SqlHelper.ExecuteScalar<string>("select dbType from cmsDataType where nodeId = @datadefinitionid",
-                        SqlHelper.CreateParameter("@datadefinitionid",_datatypedefinitionid));
-					DBTypes DataTypeSQLType = (DBTypes) Enum.Parse(typeof(DBTypes),dbtypestr,true);
-					_DBType = DataTypeSQLType;
-					switch (DataTypeSQLType) 
-					{
-						case DBTypes.Date :
-							_datafield = "dataDate";
-							break;
-						case DBTypes.Integer :
-							_datafield = "DataInt";
-							break;
-						case DBTypes.Ntext :
-							_datafield = "dataNtext";
-							break;
-						case DBTypes.Nvarchar :
-							_datafield = "dataNvarchar";
-							break;
-					}
-					return _datafield;
-				}
-				return _datafield;
-			}
-		}
-		#endregion
-	}
+                if (_datafield == "")
+                {
+                    using (var sqlHelper = Application.SqlHelper)
+                    {
+                        string dbtypestr = sqlHelper.ExecuteScalar<string>("select dbType from cmsDataType where nodeId = @datadefinitionid",
+                                sqlHelper.CreateParameter("@datadefinitionid", _datatypedefinitionid));
+                        DBTypes DataTypeSQLType = (DBTypes) Enum.Parse(typeof(DBTypes), dbtypestr, true);
+
+                        _DBType = DataTypeSQLType;
+                        switch (DataTypeSQLType)
+                        {
+                            case DBTypes.Date:
+                                _datafield = "dataDate";
+                                break;
+                            case DBTypes.Integer:
+                                _datafield = "DataInt";
+                                break;
+                            case DBTypes.Ntext:
+                                _datafield = "dataNtext";
+                                break;
+                            case DBTypes.Nvarchar:
+                                _datafield = "dataNvarchar";
+                                break;
+                        }
+                    }
+                    return _datafield;
+                }
+                return _datafield;
+            }
+        }
+        #endregion
+    }
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
-    public enum DBTypes 
-	{
-		Integer,
-		Date,
-		Nvarchar,
-		Ntext
-	}
+    public enum DBTypes
+    {
+        Integer,
+        Date,
+        Nvarchar,
+        Ntext
+    }
 }
diff --git a/src/umbraco.editorControls/DefaultData.cs b/src/umbraco.editorControls/DefaultData.cs
index 955d6da7c9..1d4e95e4cf 100644
--- a/src/umbraco.editorControls/DefaultData.cs
+++ b/src/umbraco.editorControls/DefaultData.cs
@@ -6,96 +6,105 @@ using umbraco.DataLayer;
 namespace umbraco.editorControls
 {
     [Obsolete("Use umbraco.cms.businesslogic.datatype.DefaultData instead")]
-	public class DefaultData : interfaces.IData
-	{
-		private int _propertyId;
-		private object _value;
-		protected BaseDataType _dataType;
+    public class DefaultData : interfaces.IData
+    {
+        private int _propertyId;
+        private object _value;
+        protected BaseDataType _dataType;
 
-        public static ISqlHelper SqlHelper
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
-        
+
 		public DefaultData(BaseDataType DataType) {
-			_dataType = DataType;
-		}
+            _dataType = DataType;
+        }
 
-		#region IData Members
+        #region IData Members
 
-		public virtual System.Xml.XmlNode ToXMl(System.Xml.XmlDocument d)
-		{
-			if (this._dataType.DBType == DBTypes.Ntext) 
-				return d.CreateCDataSection(this.Value.ToString());
-			return d.CreateTextNode(Value.ToString());
-		}
-		
-		public object Value 
-		{
-			get 
-			{
-				return _value;
-			}
-			set 
-			{
-				// Try to set null values if possible
-				try 
-				{
-					if (value == null)
-						SqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = NULL where id = " + _propertyId);
-					else
-						SqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = @value where id = " + _propertyId, SqlHelper.CreateParameter("@value", value) );
-					_value = value;
-				} 
-				catch (Exception e)
-				{
+        public virtual System.Xml.XmlNode ToXMl(System.Xml.XmlDocument d)
+        {
+            if (this._dataType.DBType == DBTypes.Ntext)
+                return d.CreateCDataSection(this.Value.ToString());
+            return d.CreateTextNode(Value.ToString());
+        }
+
+        public object Value
+        {
+            get
+            {
+                return _value;
+            }
+            set
+            {
+                // Try to set null values if possible
+                try
+                {
+                    if (value == null)
+                        using (var sqlHelper = Application.SqlHelper)
+						    sqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = NULL where id = " + _propertyId);
+                    else
+                        using (var sqlHelper = Application.SqlHelper)
+						    sqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = @value where id = " + _propertyId, sqlHelper.CreateParameter("@value", value) );
+                    _value = value;
+                }
+                catch (Exception e)
+                {
 					LogHelper.Error(typeof(DefaultData), "Error updating item: " + e.ToString(), e);
-					
+
 					if (value==null) value ="";
-					SqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = @value where id = " + _propertyId, SqlHelper.CreateParameter("@value", value) );
+                    using (var sqlHelper = Application.SqlHelper)
+                        sqlHelper.ExecuteNonQuery("update cmsPropertyData set "+ _dataType.DataFieldName +" = @value where id = " + _propertyId, sqlHelper.CreateParameter("@value", value) );
 					_value = value;
 				}
+            }
+        }
 
-			}
-		}
-
-		public virtual void MakeNew(int PropertyId)
-		{
-			// this default implementation of makenew does not do anything sínce 
-			// it uses the default datastorage of umbraco, and the row is already populated by the "property" object
-			// If the datatype needs to have a default value, inherit this class and override this method.
-		}
+        public virtual void MakeNew(int PropertyId)
+        {
+            // this default implementation of makenew does not do anything sínce 
+            // it uses the default datastorage of umbraco, and the row is already populated by the "property" object
+            // If the datatype needs to have a default value, inherit this class and override this method.
+        }
 
 		public void Delete() {
-			// this default implementation of delete does not do anything sínce 
-			// it uses the default datastorage of umbraco, and the row is already deleted by the "property" object
-		}
+            // this default implementation of delete does not do anything sínce 
+            // it uses the default datastorage of umbraco, and the row is already deleted by the "property" object
+        }
 
-		public int PropertyId
-		{
+        public int PropertyId
+        {
 			get {
-				return _propertyId;
-			}
-			set
-			{
-				_propertyId = value;
-				_value = SqlHelper.ExecuteScalar<object>("Select " + _dataType.DataFieldName + " from cmsPropertyData where id = " + value);
-			}
-		}
+                return _propertyId;
+            }
+            set
+            {
+                _propertyId = value;
+                using (var sqlHelper = Application.SqlHelper)
+				    _value = sqlHelper.ExecuteScalar<object>("Select " + _dataType.DataFieldName + " from cmsPropertyData where id = " + value);
+            }
+        }
 
-		// TODO: clean up Legacy - these are needed by the wysiwyeditor, in order to feed the richtextholder with version and nodeid
-		// solution, create a new version of the richtextholder, which does not depend on these.
+        // TODO: clean up Legacy - these are needed by the wysiwyeditor, in order to feed the richtextholder with version and nodeid
+        // solution, create a new version of the richtextholder, which does not depend on these.
 		public Guid Version {
 			get {
-				return new Guid(SqlHelper.ExecuteScalar<string>("Select versionId from cmsPropertyData where id = " + PropertyId).ToString());
-			}
-		}
+                using (var sqlHelper = Application.SqlHelper)
+                    return new Guid(sqlHelper.ExecuteScalar<string>("Select versionId from cmsPropertyData where id = " + PropertyId).ToString());
+            }
+        }
 
 		public int NodeId {
 			get {
-				return SqlHelper.ExecuteScalar<int>("Select contentNodeid from cmsPropertyData where id = " + PropertyId);
+                using (var sqlHelper = Application.SqlHelper)
+                    return sqlHelper.ExecuteScalar<int>("Select contentNodeid from cmsPropertyData where id = " + PropertyId);
 			}
 		}
-		#endregion
-	}	
+        #endregion
+    }
 }
diff --git a/src/umbraco.editorControls/DefaultDataKeyValue.cs b/src/umbraco.editorControls/DefaultDataKeyValue.cs
index d1288cbd1f..25516b6d92 100644
--- a/src/umbraco.editorControls/DefaultDataKeyValue.cs
+++ b/src/umbraco.editorControls/DefaultDataKeyValue.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Linq;
+using umbraco.BusinessLogic;
 using Umbraco.Core.Logging;
 
 namespace umbraco.editorControls
@@ -27,16 +28,16 @@ namespace umbraco.editorControls
                 // Don't query if there's nothing to query for..
                 if (string.IsNullOrWhiteSpace(Value.ToString()) == false)
                 {
-                    var dr = SqlHelper.ExecuteReader(string.Format("Select [value] from cmsDataTypeprevalues where id in ({0})", SqlHelper.EscapeString(Value.ToString())));
-
-                    while (dr.Read())
+                    using (var sqlHelper = Application.SqlHelper)
+                    using (var dr = sqlHelper.ExecuteReader(string.Format("Select [value] from cmsDataTypeprevalues where id in ({0})", sqlHelper.EscapeString(Value.ToString()))))
                     {
-                        value += value.Length == 0
-                            ? dr.GetString("value")
-                            : string.Format(",{0}", dr.GetString("value"));
+                        while (dr.Read())
+                        {
+                            value += value.Length == 0
+                                ? dr.GetString("value")
+                                : string.Format(",{0}", dr.GetString("value"));
+                        }
                     }
-
-                    dr.Close();
                 }
             }
             catch (Exception ex)
diff --git a/src/umbraco.editorControls/DefaultPrevalueEditor.cs b/src/umbraco.editorControls/DefaultPrevalueEditor.cs
index 5be9d9c5a6..6726ea849e 100644
--- a/src/umbraco.editorControls/DefaultPrevalueEditor.cs
+++ b/src/umbraco.editorControls/DefaultPrevalueEditor.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-
 using umbraco.interfaces;
 using umbraco.BusinessLogic;
 using umbraco.DataLayer;
@@ -23,6 +22,10 @@ namespace umbraco.editorControls
         private string _prevalue;
         private bool _displayTextBox;
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -103,8 +106,9 @@ namespace umbraco.editorControls
                     else
                         throw new ArgumentException("Datatype is not initialized");
 
-                    _prevalue =
-                        SqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where DataTypeNodeId = " + defId);
+                    using (var sqlHelper = Application.SqlHelper)
+                        _prevalue =
+                            sqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where DataTypeNodeId = " + defId);
                 }
                 return _prevalue;
             }
@@ -120,13 +124,16 @@ namespace umbraco.editorControls
 
                 _prevalue = value;
                 ensurePrevalue();
-                IParameter[] SqlParams = new IParameter[]
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    IParameter[] SqlParams = new IParameter[]
                     {
-                        SqlHelper.CreateParameter("@value", _textbox.Text),
-                        SqlHelper.CreateParameter("@dtdefid", defId)
+                        sqlHelper.CreateParameter("@value", _textbox.Text),
+                        sqlHelper.CreateParameter("@dtdefid", defId)
                     };
-                // update prevalue
-                SqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value where datatypeNodeId = @dtdefid", SqlParams);
+                    // update prevalue
+                    sqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value where datatypeNodeId = @dtdefid", SqlParams);
+                }
             }
         }
 
@@ -143,17 +150,19 @@ namespace umbraco.editorControls
                 else
                     throw new ArgumentException("Datatype is not initialized");
 
-
-                bool hasPrevalue = (SqlHelper.ExecuteScalar<int>("select count(id) from cmsDataTypePreValues where dataTypeNodeId = " + defId) > 0);
-                IParameter[] SqlParams = new IParameter[]
-                    {
-                        SqlHelper.CreateParameter("@value", _textbox.Text),
-                        SqlHelper.CreateParameter("@dtdefid", defId)
-                    };
-                if (!hasPrevalue)
+                using (var sqlHelper = Application.SqlHelper)
                 {
-                    SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
-                                              SqlParams);
+                    bool hasPrevalue = (sqlHelper.ExecuteScalar<int>("select count(id) from cmsDataTypePreValues where dataTypeNodeId = " + defId) > 0);
+                    IParameter[] SqlParams = new IParameter[]
+                        {
+                            sqlHelper.CreateParameter("@value", _textbox.Text),
+                            sqlHelper.CreateParameter("@dtdefid", defId)
+                        };
+                    if (!hasPrevalue)
+                    {
+                        sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+                                                  SqlParams);
+                    }
                 }
                 _isEnsured = true;
             }
@@ -168,9 +177,9 @@ namespace umbraco.editorControls
         {
             // save the prevalue data and get on with you life ;)
             if (_datatype != null)
-                _datatype.DBType = (cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof (cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
+                _datatype.DBType = (cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
             else if (_datatypeOld != null)
-                _datatypeOld.DBType = (DBTypes)Enum.Parse(typeof (DBTypes), _dropdownlist.SelectedValue, true);
+                _datatypeOld.DBType = (DBTypes)Enum.Parse(typeof(DBTypes), _dropdownlist.SelectedValue, true);
 
 
             if (_displayTextBox)
@@ -186,8 +195,9 @@ namespace umbraco.editorControls
             _dropdownlist.RenderControl(writer);
             writer.Write("<br style='clear: both'/></div>");
 
-            
-            if (_displayTextBox) {
+
+            if (_displayTextBox)
+            {
                 writer.Write("<div class='propertyItem'><div class='propertyItemheader'>" + ui.Text("prevalue") + "</div>");
                 _textbox.RenderControl(writer);
                 writer.Write("<br style='clear: both'/></div>");
@@ -209,8 +219,9 @@ namespace umbraco.editorControls
 
         public static string GetPrevalueFromId(int Id)
         {
-            return SqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where id = @id",
-                                                   SqlHelper.CreateParameter("@id", Id));
+            using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<string>("Select [value] from cmsDataTypePreValues where id = @id",
+                    sqlHelper.CreateParameter("@id", Id));
         }
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.editorControls/KeyValuePrevalueEditor.cs b/src/umbraco.editorControls/KeyValuePrevalueEditor.cs
index 8ea71361cd..26142e88b8 100644
--- a/src/umbraco.editorControls/KeyValuePrevalueEditor.cs
+++ b/src/umbraco.editorControls/KeyValuePrevalueEditor.cs
@@ -14,72 +14,77 @@ using System.Web.UI.HtmlControls;
 [assembly: System.Web.UI.WebResource("umbraco.editorControls.KeyValuePrevalueEditor.css", "text/css")]
 namespace umbraco.editorControls
 {
-	/// <summary>
-	/// Summary description for KeyValuePrevalueEditor.
-	/// </summary>
+    /// <summary>
+    /// Summary description for KeyValuePrevalueEditor.
+    /// </summary>
 
     [ClientDependency(ClientDependencyType.Javascript, "Jeditable/jquery.jeditable.js", "UmbracoClient")]
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public class KeyValuePrevalueEditor : System.Web.UI.WebControls.PlaceHolder, interfaces.IDataPrevalue
-	{
-	
-		// UI controls
-		public System.Web.UI.WebControls.DropDownList _dropdownlist;
-		public TextBox _textbox;
+    {
+
+        // UI controls
+        public System.Web.UI.WebControls.DropDownList _dropdownlist;
+        public TextBox _textbox;
         private TextBox _tbhidden;
         public umbraco.uicontrols.PropertyPanel pp1 = new umbraco.uicontrols.PropertyPanel();
         public umbraco.uicontrols.PropertyPanel pp2 = new umbraco.uicontrols.PropertyPanel();
-				
-		private Hashtable DeleteButtons = new Hashtable();
 
-		// referenced datatype
-		private cms.businesslogic.datatype.BaseDataType _datatype;
+        private Hashtable DeleteButtons = new Hashtable();
 
+        // referenced datatype
+        private cms.businesslogic.datatype.BaseDataType _datatype;
+
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         protected static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
 
-		public KeyValuePrevalueEditor(cms.businesslogic.datatype.BaseDataType DataType) 
-		{
-			// state it knows its datatypedefinitionid
-			_datatype = DataType;
+        public KeyValuePrevalueEditor(cms.businesslogic.datatype.BaseDataType DataType)
+        {
+            // state it knows its datatypedefinitionid
+            _datatype = DataType;
 
             setupChildControls();
-            
+
             // Bootstrap delete.
 			if (System.Web.HttpContext.Current.Request["delete"] != null) {
-				DeletePrevalue(int.Parse(System.Web.HttpContext.Current.Request["delete"]));
-			}
-			
-		}
-		
-		private void DeletePrevalue(int id) {
-			SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = " + id);
-		}
+                DeletePrevalue(int.Parse(System.Web.HttpContext.Current.Request["delete"]));
+            }
 
-		private void setupChildControls() 
-		{
-			_dropdownlist = new DropDownList();
-			_dropdownlist.ID = "dbtype";
-			
-			_textbox = new TextBox();
-			_textbox.ID = "AddValue";
+        }
+
+		private void DeletePrevalue(int id) {
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where id = " + id);
+        }
+
+        private void setupChildControls()
+        {
+            _dropdownlist = new DropDownList();
+            _dropdownlist.ID = "dbtype";
+
+            _textbox = new TextBox();
+            _textbox.ID = "AddValue";
 
             _tbhidden = new TextBox();
             _tbhidden.Attributes.Add("style", "display:none;");
             _tbhidden.CssClass = "valuesHiddenInput";
 
-			// put the childcontrols in context - ensuring that
-			// the viewstate is persisted etc.
-			this.Controls.Add(_dropdownlist);
-			this.Controls.Add(_textbox);
+            // put the childcontrols in context - ensuring that
+            // the viewstate is persisted etc.
+            this.Controls.Add(_dropdownlist);
+            this.Controls.Add(_textbox);
             this.Controls.Add(_tbhidden);
 
-			_dropdownlist.Items.Add(DBTypes.Date.ToString());
-			_dropdownlist.Items.Add(DBTypes.Integer.ToString());
-			_dropdownlist.Items.Add(DBTypes.Ntext.ToString());
-			_dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
+            _dropdownlist.Items.Add(DBTypes.Date.ToString());
+            _dropdownlist.Items.Add(DBTypes.Integer.ToString());
+            _dropdownlist.Items.Add(DBTypes.Ntext.ToString());
+            _dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
         }
 
         protected override void OnInit(EventArgs e) {
@@ -103,26 +108,26 @@ namespace umbraco.editorControls
 
         }
 
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad (e);
-        
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+
             if (!Page.IsPostBack)
-			{
-				_dropdownlist.SelectedValue = _datatype.DBType.ToString();
+            {
+                _dropdownlist.SelectedValue = _datatype.DBType.ToString();
 
-			}
+            }
 
-            
-		}
-		
-		public Control Editor 
-		{
-			get
-			{
-				return this;
-			}
-		}
+
+        }
+
+        public Control Editor
+        {
+            get
+            {
+                return this;
+            }
+        }
 
 		public void Save() 
 		{
@@ -141,13 +146,14 @@ namespace umbraco.editorControls
 
                         if (row.Split('|').Length == 2 &&  int.TryParse(row.Split('|')[0], out id) && row.Split('|')[1].Length > 0)
                         {
-
-                            IParameter[] SqlParams = new IParameter[] {
-								SqlHelper.CreateParameter("@value",row.Split('|')[1]),
-								SqlHelper.CreateParameter("@sortorder",so),
-                                SqlHelper.CreateParameter("@id",id)};
-                            SqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value, sortorder = @sortorder where id = @id", SqlParams);
-
+                            using (var sqlHelper = Application.SqlHelper)
+                            {
+                                IParameter[] SqlParams = new IParameter[] {
+                                sqlHelper.CreateParameter("@value",row.Split('|')[1]),
+                                sqlHelper.CreateParameter("@sortorder",so),
+                                sqlHelper.CreateParameter("@id",id)};
+                                sqlHelper.ExecuteNonQuery("update cmsDataTypePreValues set [value] = @value, sortorder = @sortorder where id = @id", SqlParams);
+                            }
                         }
 
                         so++;
@@ -165,25 +171,29 @@ namespace umbraco.editorControls
 
                 try
                 {
-                    so = SqlHelper.ExecuteScalar<int>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dtdefid",
-                        SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
+                    using (var sqlHelper = Application.SqlHelper)
+                        so = sqlHelper.ExecuteScalar<int>("select max(sortorder) from cmsDataTypePreValues where datatypenodeid = @dtdefid",
+                            sqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
                     so++;
                 }
                 catch { }
 
-				IParameter[] SqlParams = new IParameter[] {
-								SqlHelper.CreateParameter("@value",_textbox.Text),
-								SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId),
-                                SqlHelper.CreateParameter("@so",so)};
-				SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,@so,'')",SqlParams);
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    IParameter[] SqlParams = new IParameter[] {
+                                    sqlHelper.CreateParameter("@value",_textbox.Text),
+                                    sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId),
+                                    sqlHelper.CreateParameter("@so",so)};
+                    sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,@so,'')", SqlParams);
+                }
 				_textbox.Text = "";
 
                 ScriptManager.GetCurrent(Page).SetFocus(_textbox);
 			}
 		}
 
-		protected override void Render(HtmlTextWriter writer)
-		{
+        protected override void Render(HtmlTextWriter writer)
+        {
             writer.Write("<div class='propertyItem'><div class='propertyItemheader'>" + ui.Text("dataBaseDatatype") + "</div>");
             _dropdownlist.RenderControl(writer);
             writer.Write("<br style='clear: both'/></div>");
@@ -206,24 +216,25 @@ namespace umbraco.editorControls
 
             _tbhidden.RenderControl(writer);
 
-        
+
         }
 
-		public SortedList Prevalues {
-			get
+        public SortedList Prevalues {
+            get
             {
-                
                 SortedList retval = new SortedList();
-				IRecordsReader dr = SqlHelper.ExecuteReader(
-					"Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
-					+ _datatype.DataTypeDefinitionId + " order by sortorder");
-				
-				while (dr.Read())
-					retval.Add(dr.GetInt("id"), dr.GetString("value"));
-				dr.Close();
-				return retval;
-			}
-		}
+                using (var sqlHelper = Application.SqlHelper)
+                using (IRecordsReader dr = sqlHelper.ExecuteReader(
+                   "Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+                    + _datatype.DataTypeDefinitionId + " order by sortorder"))
+                {
+                    while (dr.Read())
+                        retval.Add(dr.GetInt("id"), dr.GetString("value"));
+
+                    return retval;
+                }
+            }
+        }
 
         public List<KeyValuePair<int, String>> PrevaluesAsKeyValuePairList
         {
@@ -232,15 +243,18 @@ namespace umbraco.editorControls
 
                 List<KeyValuePair<int, String>> items = new List<KeyValuePair<int, String>>();
 
-                IRecordsReader dr = SqlHelper.ExecuteReader(
-                    "Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
-                    + _datatype.DataTypeDefinitionId + " order by sortorder");
-
-                while (dr.Read())
-                    items.Add(new KeyValuePair<int, string>(dr.GetInt("id"), dr.GetString("value")));
-                dr.Close();
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    using (IRecordsReader dr = sqlHelper.ExecuteReader(
+                        "Select id, [value] from cmsDataTypePreValues where DataTypeNodeId = "
+                        + _datatype.DataTypeDefinitionId + " order by sortorder"))
+                    {
+                        while (dr.Read())
+                            items.Add(new KeyValuePair<int, string>(dr.GetInt("id"), dr.GetString("value")));
+                    }
+                }
                 return items;
             }
         }
-	}
+    }
 }
diff --git a/src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs b/src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
index 11e4a134e0..d93e23767f 100644
--- a/src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
+++ b/src/umbraco.editorControls/PickerRelations/PickerRelationsDataEditor.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Web.UI;
 using System.Web.UI.WebControls;
-
+using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic.datatype; // DefaultData
 using umbraco.cms.businesslogic.property; // Property
 using umbraco.cms.businesslogic.relation; // RelationType
@@ -77,10 +77,13 @@ namespace umbraco.editorControls.PickerRelations
         {
             get
             {
-                return uQuery.GetUmbracoObjectType(
-                        uQuery.SqlHelper.ExecuteScalar<Guid>(
-                            "SELECT nodeObjectType FROM umbracoNode WHERE id = @id",
-                            uQuery.SqlHelper.CreateParameter("@id", this.CurrentContentId)));
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    var guid = sqlHelper.ExecuteScalar<Guid>(
+                        "SELECT nodeObjectType FROM umbracoNode WHERE id = @id",
+                        sqlHelper.CreateParameter("@id", this.CurrentContentId));
+                    return uQuery.GetUmbracoObjectType(guid);
+                }
             }
         }
 
diff --git a/src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs b/src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
index da29b268cc..13f786359b 100644
--- a/src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
+++ b/src/umbraco.editorControls/PickerRelations/PickerRelationsEventHandler.cs
@@ -229,15 +229,16 @@ namespace umbraco.editorControls.PickerRelations
 
 			getRelationsSql += " AND comment = '" + instanceIdentifier + "'";
 
-			using (IRecordsReader relations = uQuery.SqlHelper.ExecuteReader(getRelationsSql))
+            using (var sqlHelper = Application.SqlHelper)
+            using (IRecordsReader relations = sqlHelper.ExecuteReader(getRelationsSql))
 			{
 				//clear data
 				Relation relation;
-				while (relations.Read())
+			    while (relations.Read())
 				{
-					relation = new Relation(relations.GetInt("id"));
+				    relation = new Relation(relations.GetInt("id"));
 
-					// TODO: [HR] check to see if an instance identifier is used
+				    // TODO: [HR] check to see if an instance identifier is used
 					relation.Delete();
 				}
 			}
diff --git a/src/umbraco.editorControls/SettingControls/Pickers/Field.cs b/src/umbraco.editorControls/SettingControls/Pickers/Field.cs
index c937a6d096..c41143deeb 100644
--- a/src/umbraco.editorControls/SettingControls/Pickers/Field.cs
+++ b/src/umbraco.editorControls/SettingControls/Pickers/Field.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Web;
+using umbraco.BusinessLogic;
 using umbraco.DataLayer;
 using umbraco.cms.businesslogic.datatype;
 
@@ -40,11 +41,16 @@ namespace umbraco.editorControls.SettingControls.Pickers
 
             string fieldSql = "select distinct alias from cmsPropertyType order by alias";
 
-            IRecordsReader dataTypes = umbraco.BusinessLogic.Application.SqlHelper.ExecuteReader(fieldSql);
-            ddl.DataTextField = "alias";
-            ddl.DataValueField = "alias";
-            ddl.DataSource = dataTypes;
-            ddl.DataBind();
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                using (IRecordsReader dataTypes = sqlHelper.ExecuteReader(fieldSql))
+                {
+                    ddl.DataTextField = "alias";
+                    ddl.DataValueField = "alias";
+                    ddl.DataSource = dataTypes;
+                    ddl.DataBind();
+                }
+            }
 
             foreach (string s in preValuesSource)
             {
diff --git a/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs b/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
index 15328db454..164419b8bc 100644
--- a/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
+++ b/src/umbraco.editorControls/imagecropper/PrevalueEditor.cs
@@ -331,11 +331,13 @@ namespace umbraco.editorControls.imagecropper
 
             string data = String.Format("{0}|{1}", generalData, templateData);
 
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",
-                                      SqlHelper.CreateParameter("@dtdefid", _dataType.DataTypeDefinitionId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", 
+                    sqlHelper.CreateParameter("@dtdefid", _dataType.DataTypeDefinitionId));
 
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
-                                      SqlHelper.CreateParameter("@dtdefid", _dataType.DataTypeDefinitionId), SqlHelper.CreateParameter("@value", data));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+                    sqlHelper.CreateParameter("@dtdefid", _dataType.DataTypeDefinitionId), sqlHelper.CreateParameter("@value", data));
         }
 
         protected override void Render(HtmlTextWriter writer)
@@ -409,23 +411,25 @@ namespace umbraco.editorControls.imagecropper
         {
             get
             {
-                object conf =
-                    SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-                                                    SqlHelper.CreateParameter("@datatypenodeid", _dataType.DataTypeDefinitionId));
-
-                if (conf != null)
-                    return conf.ToString();
+                using (var sqlHelper = Application.SqlHelper) { 
+                    object conf =
+                    sqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
+                                                    sqlHelper.CreateParameter("@datatypenodeid", _dataType.DataTypeDefinitionId));
 
+                    if (conf != null)
+                        return conf.ToString();
+                }
                 return string.Empty;
             }
         }
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
-            get
-            {
-                return Application.SqlHelper;
-            }
+            get { return Application.SqlHelper; }
         }
     }
 }
\ No newline at end of file
diff --git a/src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs b/src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
index 8b4c264662..06dbd15cfd 100644
--- a/src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
+++ b/src/umbraco.editorControls/macrocontainer/PrevalueEditor.cs
@@ -153,9 +153,10 @@ namespace umbraco.editorControls.macrocontainer
             {
                 if (_configuration == null)
                 {
-                return Application.SqlHelper.ExecuteScalar<string>(
+                using (var sqlHelper = Application.SqlHelper)
+                return sqlHelper.ExecuteScalar<string>(
                         "select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-                        Application.SqlHelper.CreateParameter("@datatypenodeid", Datatype.DataTypeDefinitionId));
+                        sqlHelper.CreateParameter("@datatypenodeid", Datatype.DataTypeDefinitionId));
                 }
                 else
                 {
@@ -279,10 +280,12 @@ namespace umbraco.editorControls.macrocontainer
         /// </summary>
         public void Save()
         {
-       
-            Application.SqlHelper.ExecuteNonQuery(
-                "delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",
-                Application.SqlHelper.CreateParameter("@dtdefid", Datatype.DataTypeDefinitionId));
+
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", 
+                    sqlHelper.CreateParameter("@dtdefid", Datatype.DataTypeDefinitionId));
+            }
 
             StringBuilder config = new StringBuilder();
             config.Append(GetSelectedMacosFromCheckList());
@@ -299,12 +302,10 @@ namespace umbraco.editorControls.macrocontainer
             int.TryParse(_txtPreferedWidth.Text, out prefwidth);
             config.Append(prefwidth);
 
-            Application.SqlHelper.ExecuteNonQuery(
-                "insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
-                Application.SqlHelper.CreateParameter("@dtdefid", Datatype.DataTypeDefinitionId), Application.SqlHelper.CreateParameter("@value", config.ToString()));
-
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+                    sqlHelper.CreateParameter("@dtdefid", Datatype.DataTypeDefinitionId), sqlHelper.CreateParameter("@value", config.ToString()));
         }
         #endregion
-
     }
 }
diff --git a/src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs b/src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
index 674d7d69aa..e9ae5cf7aa 100644
--- a/src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
+++ b/src/umbraco.editorControls/mediapicker/MediaPickerPrevalueEditor.cs
@@ -17,7 +17,10 @@ namespace umbraco.editorControls.mediapicker
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public class MediaPickerPrevalueEditor : System.Web.UI.WebControls.PlaceHolder, umbraco.interfaces.IDataPrevalue
     {
-
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -86,31 +89,36 @@ namespace umbraco.editorControls.mediapicker
             // Generate data-string
             string data = _checkboxShowPreview.Checked.ToString() + "|" + _checkboxShowAdvancedDialog.Checked.ToString();
 
-            // If the add new prevalue textbox is filled out - add the value to the collection.
-            IParameter[] SqlParams = new IParameter[] {
-			            SqlHelper.CreateParameter("@value",data),
-						SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
-            
-            // For SQL CE 4 support we need this again!
-            SqlParams = new IParameter[] {
-			            SqlHelper.CreateParameter("@value",data),
-						SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                // If the add new prevalue textbox is filled out - add the value to the collection.
+                IParameter[] SqlParams = new IParameter[] {
+                        sqlHelper.CreateParameter("@value",data),
+                        sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+
+                // For SQL CE 4 support we need this again!
+                SqlParams = new IParameter[] {
+                            sqlHelper.CreateParameter("@value",data),
+                            sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            }
         }
 
         public string Configuration
         {
             get
             {
-                object conf =
-                    SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-                                            SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
-                if (conf != null)
-                    return conf.ToString();
-                else
-                    return "";
-
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    object conf =
+                        sqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
+                                                sqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+                    if (conf != null)
+                        return conf.ToString();
+                    else
+                        return "";
+                }
             }
         }
 
diff --git a/src/umbraco.editorControls/memberpicker/memberPicker.cs b/src/umbraco.editorControls/memberpicker/memberPicker.cs
index 358c7e7cf7..470936de9f 100644
--- a/src/umbraco.editorControls/memberpicker/memberPicker.cs
+++ b/src/umbraco.editorControls/memberpicker/memberPicker.cs
@@ -57,23 +57,25 @@ namespace umbraco.editorControls
 		protected override void OnInit(EventArgs e)
 		{
 			base.OnInit (e);
-			IRecordsReader dropdownData = Application.SqlHelper.ExecuteReader("select id, text from umbracoNode where nodeObjectType = '39EB0F98-B348-42A1-8662-E7EB18487560' order by text");
-			base.DataValueField = "id";
-			base.DataTextField = "text";
-			base.DataSource = dropdownData;
-			base.DataBind();
-			base.Items.Insert(0, new ListItem(ui.Text("choose") + "...",""));
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                using (IRecordsReader dropdownData = sqlHelper.ExecuteReader("select id, text from umbracoNode where nodeObjectType = '39EB0F98-B348-42A1-8662-E7EB18487560' order by text")) 
+                { 
+                    base.DataValueField = "id";
+                    base.DataTextField = "text";
+                    base.DataSource = dropdownData;
+                    base.DataBind();
+                    base.Items.Insert(0, new ListItem(ui.Text("choose") + "...", ""));
 
-            base.SelectedValue = _data.Value != null ? _data.Value.ToString() : "";
-
-			// Iterate on the control items and mark fields by match them with the Text property!
-			//foreach(ListItem li in base.Items) 
-			//{
-			//	if ((","+base.SelectedValue+",").IndexOf(","+li.Value.ToString()+",") > -1)
-			//		li.Selected = true;
-			//}
-
-			dropdownData.Close();
+                    base.SelectedValue = _data.Value != null ? _data.Value.ToString() : "";
+                }
+                // Iterate on the control items and mark fields by match them with the Text property!
+                //foreach(ListItem li in base.Items) 
+                //{
+                //	if ((","+base.SelectedValue+",").IndexOf(","+li.Value.ToString()+",") > -1)
+                //		li.Selected = true;
+                //}
+            }
 		}
 	
 		/// <summary> 
diff --git a/src/umbraco.editorControls/tags/PrevalueEditor.cs b/src/umbraco.editorControls/tags/PrevalueEditor.cs
index 6bf70218e8..eb38f2523a 100644
--- a/src/umbraco.editorControls/tags/PrevalueEditor.cs
+++ b/src/umbraco.editorControls/tags/PrevalueEditor.cs
@@ -15,12 +15,13 @@ namespace umbraco.editorControls.tags
     {
         private TextBox _group;
 
-        public static ISqlHelper SqlHelper
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        public ISqlHelper SqlHelper
         {
-            get
-            {
-                return Application.SqlHelper;
-            }
+            get { return Application.SqlHelper; }
         }
 
         // referenced datatype
@@ -44,16 +45,18 @@ namespace umbraco.editorControls.tags
         public void Save()
         {
             //clear all datatype data first...
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePrevalues where datatypeNodeId = " + _datatype.DataTypeDefinitionId);
-            
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePrevalues where datatypeNodeId = " + _datatype.DataTypeDefinitionId);
+
             //Save datatype
             _datatype.DBType = datatype.DBTypes.Ntext;
-            
+
             // Save path and control type..
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePrevalues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,@alias)",
-                SqlHelper.CreateParameter("@value", _group.Text),
-                SqlHelper.CreateParameter("@alias", "group"),
-                SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
+            using (var sqlHelper = Application.SqlHelper)
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePrevalues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,@alias)",
+                    sqlHelper.CreateParameter("@value", _group.Text),
+                    sqlHelper.CreateParameter("@alias", "group"),
+                    sqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId));
         }
 
         private void setupChildControls()
@@ -92,19 +95,20 @@ namespace umbraco.editorControls.tags
             get
             {
                 SortedList retval = new SortedList();
-                IRecordsReader dr = SqlHelper.ExecuteReader(
-                    "Select alias, [value] from cmsDataTypeprevalues where DataTypeNodeId = " + _datatype.DataTypeDefinitionId + " order by sortorder");
-
-                while (dr.Read())
+                using (var sqlHelper = Application.SqlHelper)
+                using (var dr = sqlHelper.ExecuteReader(
+                    "Select alias, [value] from cmsDataTypeprevalues where DataTypeNodeId = " + _datatype.DataTypeDefinitionId + " order by sortorder"))
                 {
-                    if (!retval.ContainsKey(dr.GetString("alias")))
+                    while (dr.Read())
                     {
-                        retval.Add(dr.GetString("alias"), dr.GetString("value"));
+                        if (!retval.ContainsKey(dr.GetString("alias")))
+                        {
+                            retval.Add(dr.GetString("alias"), dr.GetString("value"));
+                        }
                     }
-                }
 
-                dr.Close();
-                return retval;
+                    return retval;
+                }
             }
         }
     }
diff --git a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
index 533a961416..bc7382b873 100644
--- a/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
+++ b/src/umbraco.editorControls/tinymce/tinyMCEPreValueConfigurator.cs
@@ -13,8 +13,8 @@ namespace umbraco.editorControls.tinymce
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public class tinyMCEPreValueConfigurator : System.Web.UI.WebControls.PlaceHolder, interfaces.IDataPrevalue
     {
-		// UI controls
-		private CheckBoxList _editorButtons;
+        // UI controls
+        private CheckBoxList _editorButtons;
         private CheckBox _enableRightClick;
         private DropDownList _dropdownlist;
         private CheckBoxList _advancedUsersList;
@@ -27,27 +27,32 @@ namespace umbraco.editorControls.tinymce
         private RegularExpressionValidator _widthValidator = new RegularExpressionValidator();
         private RegularExpressionValidator _heightValidator = new RegularExpressionValidator();
         private RegularExpressionValidator _maxImageWidthValidator = new RegularExpressionValidator();
-				
-		// referenced datatype
-		private cms.businesslogic.datatype.BaseDataType _datatype;
+
+        // referenced datatype
+        private cms.businesslogic.datatype.BaseDataType _datatype;
         private string _selectedButtons = "";
         private string _advancedUsers = "";
         private string _stylesheets = "";
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
 
-        public tinyMCEPreValueConfigurator(cms.businesslogic.datatype.BaseDataType DataType) 
-		{
-			// state it knows its datatypedefinitionid
-			_datatype = DataType;
-			setupChildControls();
-		}
-		
-		private void setupChildControls() 
-		{
+
+        public tinyMCEPreValueConfigurator(cms.businesslogic.datatype.BaseDataType DataType)
+        {
+            // state it knows its datatypedefinitionid
+            _datatype = DataType;
+            setupChildControls();
+        }
+
+        private void setupChildControls()
+        {
             _dropdownlist = new DropDownList();
             _dropdownlist.ID = "dbtype";
             _dropdownlist.Items.Add(DBTypes.Date.ToString());
@@ -61,7 +66,7 @@ namespace umbraco.editorControls.tinymce
             _editorButtons.CellPadding = 3;
 
             _enableRightClick = new CheckBox();
-		    _enableRightClick.ID = "enableRightClick";
+            _enableRightClick.ID = "enableRightClick";
 
             _advancedUsersList = new CheckBoxList();
             _advancedUsersList.ID = "advancedUsersList";
@@ -76,14 +81,14 @@ namespace umbraco.editorControls.tinymce
             _maxImageWidth.ID = "maxImageWidth";
 
             // put the childcontrols in context - ensuring that
-			// the viewstate is persisted etc.
+            // the viewstate is persisted etc.
             Controls.Add(_dropdownlist);
             Controls.Add(_enableRightClick);
             Controls.Add(_editorButtons);
             Controls.Add(_advancedUsersList);
             Controls.Add(_stylesheetList);
             Controls.Add(_width);
-		    Controls.Add(_widthValidator);
+            Controls.Add(_widthValidator);
             Controls.Add(_height);
             Controls.Add(_heightValidator);
             Controls.Add(_showLabel);
@@ -91,11 +96,11 @@ namespace umbraco.editorControls.tinymce
             Controls.Add(_maxImageWidthValidator);
             //            Controls.Add(_fullWidth);
 
-		}
-		
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad (e);
+        }
+
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
             // add ids to controls
             _width.ID = "width";
             _height.ID = "height";
@@ -104,19 +109,19 @@ namespace umbraco.editorControls.tinymce
             // initialize validators
             _widthValidator.ValidationExpression = "0*[1-9][0-9]*";
             _widthValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab", ui.Text("width"), new BasePages.BasePage().getUser());
-		    _widthValidator.Display = ValidatorDisplay.Dynamic;
+            _widthValidator.Display = ValidatorDisplay.Dynamic;
             _widthValidator.ControlToValidate = _width.ID;
             _heightValidator.ValidationExpression = "0*[1-9][0-9]*";
             _heightValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab", ui.Text("height"), new BasePages.BasePage().getUser());
             _heightValidator.ControlToValidate = _height.ID;
             _heightValidator.Display = ValidatorDisplay.Dynamic;
             _maxImageWidthValidator.ValidationExpression = "0*[1-9][0-9]*";
-            _maxImageWidthValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab","'" +  ui.Text("rteMaximumDefaultImgSize") + "'", new BasePages.BasePage().getUser());
+            _maxImageWidthValidator.ErrorMessage = ui.Text("errorHandling", "errorIntegerWithoutTab", "'" + ui.Text("rteMaximumDefaultImgSize") + "'", new BasePages.BasePage().getUser());
             _maxImageWidthValidator.ControlToValidate = _maxImageWidth.ID;
             _maxImageWidthValidator.Display = ValidatorDisplay.Dynamic;
-            
+
             if (!Page.IsPostBack)
-			{
+            {
                 if (Configuration != null)
                 {
                     string[] config = Configuration.Split("|".ToCharArray());
@@ -133,13 +138,13 @@ namespace umbraco.editorControls.tinymce
 
                         if (config.Length > 4 && config[4].Split(',').Length > 1)
                         {
-//                        if (config[3] == "1")
-//                            _fullWidth.Checked = true;
-//                        else
-//                        {
+                            //                        if (config[3] == "1")
+                            //                            _fullWidth.Checked = true;
+                            //                        else
+                            //                        {
                             _width.Text = config[4].Split(',')[0];
                             _height.Text = config[4].Split(',')[1];
-//                        }
+                            //                        }
                         }
 
                         // if width and height are empty or lower than 0 then set default sizes:
@@ -166,7 +171,7 @@ namespace umbraco.editorControls.tinymce
                     IDictionaryEnumerator ide = tinyMCEConfiguration.SortedCommands.GetEnumerator();
                     while (ide.MoveNext())
                     {
-                        tinyMCECommand cmd = (tinyMCECommand) ide.Value;
+                        tinyMCECommand cmd = (tinyMCECommand)ide.Value;
                         ListItem li =
                             new ListItem(
                                 string.Format("<img src=\"{0}\" class=\"tinymceIcon\" alt=\"{1}\" />&nbsp;", cmd.Icon,
@@ -198,25 +203,25 @@ namespace umbraco.editorControls.tinymce
                     }
                 }
 
-			    // Mark the current db type
+                // Mark the current db type
                 _dropdownlist.SelectedValue = _datatype.DBType.ToString();
-                    
-            }
-		}
-		
-		public Control Editor 
-		{
-			get
-			{
-				return this;
-			}
-		}
 
-		public virtual void Save() 
-		{
+            }
+        }
+
+        public Control Editor
+        {
+            get
+            {
+                return this;
+            }
+        }
+
+        public virtual void Save()
+        {
             _datatype.DBType = (cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
 
-			// Generate data-string
+            // Generate data-string
             string data = ",";
 
             foreach (ListItem li in _editorButtons.Items)
@@ -238,43 +243,39 @@ namespace umbraco.editorControls.tinymce
 
             data += "|";
 
-            
-		    data += "0|";
-            /*
-            if (_fullWidth.Checked)
-                data += "1|";
-            else
-                data += "0|";
-            */
+            data += "0|";
 
             data += _width.Text + "," + _height.Text + "|";
 
             foreach (ListItem li in _stylesheetList.Items)
                 if (li.Selected)
                     data += li.Value + ",";
-		    data += "|";
+
+            data += "|";
             data += _showLabel.Checked.ToString() + "|";
             data += _maxImageWidth.Text + "|";
 
-
-            // If the add new prevalue textbox is filled out - add the value to the collection.
-			IParameter[] SqlParams = new IParameter[] {
-										    SqlHelper.CreateParameter("@value",data),
-											SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-			SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
-            // we need to populate the parameters again due to an issue with SQL CE
-            SqlParams = new IParameter[] {
-										    SqlHelper.CreateParameter("@value",data),
-											SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-			SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",SqlParams);
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                // If the add new prevalue textbox is filled out - add the value to the collection.
+                IParameter[] SqlParams = new IParameter[] {
+                                                sqlHelper.CreateParameter("@value",data),
+                                                sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+                // we need to populate the parameters again due to an issue with SQL CE
+                SqlParams = new IParameter[] {
+                                                sqlHelper.CreateParameter("@value",data),
+                                                sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            }
 		}
 
-		protected override void Render(HtmlTextWriter writer)
-		{
-			writer.WriteLine("<table>");
+        protected override void Render(HtmlTextWriter writer)
+        {
+            writer.WriteLine("<table>");
             writer.WriteLine("<tr><th>" + ui.Text("editdatatype", "dataBaseDatatype") + ":</th><td>");
-			_dropdownlist.RenderControl(writer);
-			writer.Write("</td></tr>");
+            _dropdownlist.RenderControl(writer);
+            writer.Write("</td></tr>");
             writer.Write("<tr><th>" + ui.Text("editdatatype", "rteButtons") + ":</th><td>");
             _editorButtons.RenderControl(writer);
             writer.Write("</td></tr>");
@@ -287,7 +288,7 @@ namespace umbraco.editorControls.tinymce
             writer.Write("<tr><th>" + ui.Text("editdatatype", "rteEnableAdvancedSettings") + ":</th><td>");
             _advancedUsersList.RenderControl(writer);
             writer.Write("</td></tr>");
-            writer.Write("<tr><th>"); 
+            writer.Write("<tr><th>");
             //"Size:</th><td>Maximum width and height: ");
             //            _fullWidth.RenderControl(writer);
 
@@ -309,20 +310,21 @@ namespace umbraco.editorControls.tinymce
             writer.Write("</table>");
         }
 
-		public string Configuration 
-		{
-			get 
-			{
+        public string Configuration
+        {
+            get
+            {
                 try
                 {
-                    return SqlHelper.ExecuteScalar<string>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid", SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+                    using (var sqlHelper = Application.SqlHelper)
+                        return sqlHelper.ExecuteScalar<string>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid", sqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
                 }
                 catch
                 {
                     return "";
                 }
-			}
-		}
+            }
+        }
 
-	}
+    }
 }
diff --git a/src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs b/src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
index a0e78966b9..76d612b8af 100644
--- a/src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
+++ b/src/umbraco.editorControls/ultimatepicker/ultimatePickerPrevalueEditor.cs
@@ -19,7 +19,11 @@ namespace umbraco.editorControls.ultimatepicker
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public class ultimatePickerPrevalueEditor : System.Web.UI.WebControls.PlaceHolder, umbraco.interfaces.IDataPrevalue
     {
-        public ISqlHelper SqlHelper
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
         }
@@ -115,24 +119,25 @@ namespace umbraco.editorControls.ultimatepicker
         public void Save()
         {
             _datatype.DBType = (umbraco.cms.businesslogic.datatype.DBTypes)Enum.Parse(typeof(umbraco.cms.businesslogic.datatype.DBTypes), _dropdownlist.SelectedValue, true);
-
-
+            
             string validatedFilter = validateFilterInput(_textboxDocumentTypeFilter.Text);
 
             // Generate data-string
             string data = _dropdownlistType.SelectedValue + "|" + _textboxParentNode.Text + "|" + validatedFilter + "|" + _checkboxShowGrandChildren.Checked.ToString();
 
-            // If the add new prevalue textbox is filled out - add the value to the collection.
-            IParameter[] SqlParams = new IParameter[] {
-			            SqlHelper.CreateParameter("@value",data),
-						SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
-            // need to unlock the parameters (for SQL CE compat)
-            SqlParams = new IParameter[] {
-										SqlHelper.CreateParameter("@value",data),
-										SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
-
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                // If the add new prevalue textbox is filled out - add the value to the collection.
+                IParameter[] SqlParams = new IParameter[] {
+                            sqlHelper.CreateParameter("@value",data),
+                            sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+                // need to unlock the parameters (for SQL CE compat)
+                SqlParams = new IParameter[] {
+                                            sqlHelper.CreateParameter("@value",data),
+                                            sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            }
 
         }
 
@@ -161,14 +166,15 @@ namespace umbraco.editorControls.ultimatepicker
         {
             get
             {
-                object conf =
-                    SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-                                            SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
-                if (conf != null)
-                    return conf.ToString();
-                else
-                    return "";
-
+                using (var sqlHelper = Application.SqlHelper) { 
+                    object conf =
+                        sqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
+                                                sqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+                    if (conf != null)
+                        return conf.ToString();
+                    else
+                        return "";
+                }
             }
         }
 
diff --git a/src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs b/src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
index 9fb0e526c4..870144f9e5 100644
--- a/src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
+++ b/src/umbraco.editorControls/uploadfield/uploadFieldPreValue.cs
@@ -19,6 +19,10 @@ namespace umbraco.editorControls.uploadfield
 		// referenced datatype
 		private cms.businesslogic.datatype.BaseDataType _datatype;
 
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
         public static ISqlHelper SqlHelper
         {
             get { return Application.SqlHelper; }
@@ -80,16 +84,19 @@ namespace umbraco.editorControls.uploadfield
 
 			// Generate data-string
             string data = _textboxThumbnails.Text;
-			// If the add new prevalue textbox is filled out - add the value to the collection.
-			IParameter[] SqlParams = new IParameter[] {
-										SqlHelper.CreateParameter("@value",data),
-										SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-			SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid",SqlParams);
-            // need to unlock the parameters (for SQL CE compat)
-            SqlParams = new IParameter[] {
-										SqlHelper.CreateParameter("@value",data),
-										SqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
-            SqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            // If the add new prevalue textbox is filled out - add the value to the collection.
+            using (var sqlHelper = Application.SqlHelper)
+            {
+                IParameter[] SqlParams = new IParameter[] {
+                                            sqlHelper.CreateParameter("@value",data),
+                                            sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+                // need to unlock the parameters (for SQL CE compat)
+                SqlParams = new IParameter[] {
+                                            sqlHelper.CreateParameter("@value",data),
+                                            sqlHelper.CreateParameter("@dtdefid",_datatype.DataTypeDefinitionId)};
+                sqlHelper.ExecuteNonQuery("insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')", SqlParams);
+            }
 		}
 
 		protected override void Render(HtmlTextWriter writer)
@@ -108,11 +115,14 @@ namespace umbraco.editorControls.uploadfield
 		{
 			get 
 			{
-                object configVal = SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid", SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
-                if (configVal != null)
-                    return configVal.ToString();
-                else
-                    return "";
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    object configVal = sqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid", sqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+                    if (configVal != null)
+                        return configVal.ToString();
+                    else
+                        return "";
+                }
 			}
 		}
 
diff --git a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
index 555407b875..f2303d5af5 100644
--- a/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
+++ b/src/umbraco.editorControls/userControlWrapper/usercontrolPrevalueEditor.cs
@@ -21,200 +21,204 @@ namespace umbraco.editorControls.userControlGrapper
 {
     [Obsolete("IDataType and all other references to the legacy property editors are no longer used this will be removed from the codebase in future versions")]
     public class usercontrolPrevalueEditor : System.Web.UI.WebControls.PlaceHolder, umbraco.interfaces.IDataPrevalue
-	{
-		public ISqlHelper SqlHelper
-		{
-			get { return Application.SqlHelper; }
-		}
+    {
+        /// <summary>
+        /// Unused, please do not use
+        /// </summary>
+        [Obsolete("Obsolete, For querying the database use the new UmbracoDatabase object ApplicationContext.Current.DatabaseContext.Database", false)]
+        public static ISqlHelper SqlHelper
+        {
+            get { return Application.SqlHelper; }
+        }
 
-		#region IDataPrevalue Members
+        #region IDataPrevalue Members
 
-		// referenced datatype
-		private umbraco.cms.businesslogic.datatype.BaseDataType _datatype;
+        // referenced datatype
+        private umbraco.cms.businesslogic.datatype.BaseDataType _datatype;
 
-		private DropDownList _dropdownlist;
-		private DropDownList _dropdownlistUserControl;
-		private PlaceHolder _phSettings;
+        private DropDownList _dropdownlist;
+        private DropDownList _dropdownlistUserControl;
+        private PlaceHolder _phSettings;
 
-		private Dictionary<string, DataEditorSettingType> dtSettings = new Dictionary<string, DataEditorSettingType>();
+        private Dictionary<string, DataEditorSettingType> dtSettings = new Dictionary<string, DataEditorSettingType>();
 
-		public usercontrolPrevalueEditor(umbraco.cms.businesslogic.datatype.BaseDataType DataType) 
-		{
-			// state it knows its datatypedefinitionid
-			_datatype = DataType;
-			setupChildControls();
+        public usercontrolPrevalueEditor(umbraco.cms.businesslogic.datatype.BaseDataType DataType)
+        {
+            // state it knows its datatypedefinitionid
+            _datatype = DataType;
+            setupChildControls();
 
-		}
-		
-		private void setupChildControls() 
-		{
-			_dropdownlist = new DropDownList();
-			_dropdownlist.ID = "dbtype";
-			_dropdownlist.Items.Add(DBTypes.Date.ToString());
-			_dropdownlist.Items.Add(DBTypes.Integer.ToString());
-			_dropdownlist.Items.Add(DBTypes.Ntext.ToString());
-			_dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
-			
-			_dropdownlistUserControl = new DropDownList();
-			_dropdownlistUserControl.ID = "usercontrol";
+        }
 
-			_phSettings = new PlaceHolder();
-			_phSettings.ID = "settings";
+        private void setupChildControls()
+        {
+            _dropdownlist = new DropDownList();
+            _dropdownlist.ID = "dbtype";
+            _dropdownlist.Items.Add(DBTypes.Date.ToString());
+            _dropdownlist.Items.Add(DBTypes.Integer.ToString());
+            _dropdownlist.Items.Add(DBTypes.Ntext.ToString());
+            _dropdownlist.Items.Add(DBTypes.Nvarchar.ToString());
 
-			// put the childcontrols in context - ensuring that
-			// the viewstate is persisted etc.
-			Controls.Add(_dropdownlist);
-			Controls.Add(_dropdownlistUserControl);
-			Controls.Add(_phSettings);
+            _dropdownlistUserControl = new DropDownList();
+            _dropdownlistUserControl.ID = "usercontrol";
 
-			// populate the usercontrol dropdown
-			_dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), ""));
-			populateUserControls( IOHelper.MapPath( SystemDirectories.UserControls) );
+            _phSettings = new PlaceHolder();
+            _phSettings.ID = "settings";
 
-		   
-		}
+            // put the childcontrols in context - ensuring that
+            // the viewstate is persisted etc.
+            Controls.Add(_dropdownlist);
+            Controls.Add(_dropdownlistUserControl);
+            Controls.Add(_phSettings);
 
-		private void populateUserControls(string path)
-		{
-			DirectoryInfo di = new DirectoryInfo(path);
+            // populate the usercontrol dropdown
+            _dropdownlistUserControl.Items.Add(new ListItem(ui.Text("choose"), ""));
+            populateUserControls(IOHelper.MapPath(SystemDirectories.UserControls));
+
+
+        }
+
+        private void populateUserControls(string path)
+        {
+            DirectoryInfo di = new DirectoryInfo(path);
             if (di.Exists == false) return;
 
-			foreach (FileInfo uc in di.GetFiles("*.ascx"))
-			{
+            foreach (FileInfo uc in di.GetFiles("*.ascx"))
+            {
                 string ucRoot = IOHelper.MapPath(SystemDirectories.UserControls);
 
-				_dropdownlistUserControl.Items.Add(
+                _dropdownlistUserControl.Items.Add(
 
                     new ListItem(SystemDirectories.UserControls +
                             uc.FullName.Substring(ucRoot.Length).Replace(IOHelper.DirSepChar, '/'))
 
-					/*
-					new ListItem( 
-						uc.FullName.Substring( uc.FullName.IndexOf(root), uc.FullName.Length - uc.FullName.IndexOf(root)).Replace(IOHelper.DirSepChar, '/'))
-					  */  
-						);
+                        /*
+                        new ListItem( 
+                            uc.FullName.Substring( uc.FullName.IndexOf(root), uc.FullName.Length - uc.FullName.IndexOf(root)).Replace(IOHelper.DirSepChar, '/'))
+                          */
+                        );
 
-			}
-			foreach (DirectoryInfo dir in di.GetDirectories())
-				populateUserControls(dir.FullName);
-		}
+            }
+            foreach (DirectoryInfo dir in di.GetDirectories())
+                populateUserControls(dir.FullName);
+        }
 
-		public Control Editor
-		{
-			get
-			{
-				return this;
-			}
-		}
+        public Control Editor
+        {
+            get
+            {
+                return this;
+            }
+        }
 
 
-		protected override void OnLoad(EventArgs e)
-		{
-			base.OnLoad(e);
-			if (!Page.IsPostBack)
-			{
-				string config = Configuration;
-				if (config != "")
-				{
-					_dropdownlistUserControl.SelectedValue = config;
-
-					
-				}
-				_dropdownlist.SelectedValue = _datatype.DBType.ToString();
+        protected override void OnLoad(EventArgs e)
+        {
+            base.OnLoad(e);
+            if (!Page.IsPostBack)
+            {
+                string config = Configuration;
+                if (config != "")
+                {
+                    _dropdownlistUserControl.SelectedValue = config;
 
 
-				
-			}
+                }
+                _dropdownlist.SelectedValue = _datatype.DBType.ToString();
 
-			//check for settings
-			if (!string.IsNullOrEmpty(Configuration))
-				LoadSetttings(Configuration);
-		   
 
-		}
 
-		private Dictionary<string, DataEditorSetting> GetSettings(Type t)
-		{
-			Dictionary<string, DataEditorSetting> settings = new Dictionary<string, DataEditorSetting>();
+            }
 
-			foreach (System.Reflection.PropertyInfo p in t.GetProperties())
-			{
+            //check for settings
+            if (!string.IsNullOrEmpty(Configuration))
+                LoadSetttings(Configuration);
 
-				object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
 
-				if (o.Length > 0)
-					settings.Add(p.Name, (DataEditorSetting)o[0]);
-			}
-			return settings;
-		}
+        }
 
-		private bool HasSettings(Type t)
-		{
-			bool hasSettings = false;
-			foreach (System.Reflection.PropertyInfo p in t.GetProperties())
-			{
-				object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
+        private Dictionary<string, DataEditorSetting> GetSettings(Type t)
+        {
+            Dictionary<string, DataEditorSetting> settings = new Dictionary<string, DataEditorSetting>();
 
-				if (o.Length > 0)
-				{
-					hasSettings = true;
-					break;
-				}
-			}
+            foreach (System.Reflection.PropertyInfo p in t.GetProperties())
+            {
 
-			return hasSettings;
-		}
+                object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
 
-		private void LoadSetttings(string fileName)
-		{
+                if (o.Length > 0)
+                    settings.Add(p.Name, (DataEditorSetting)o[0]);
+            }
+            return settings;
+        }
+
+        private bool HasSettings(Type t)
+        {
+            bool hasSettings = false;
+            foreach (System.Reflection.PropertyInfo p in t.GetProperties())
+            {
+                object[] o = p.GetCustomAttributes(typeof(DataEditorSetting), true);
+
+                if (o.Length > 0)
+                {
+                    hasSettings = true;
+                    break;
+                }
+            }
+
+            return hasSettings;
+        }
+
+        private void LoadSetttings(string fileName)
+        {
             // due to legacy, some user controls may not have the tilde start
             if (fileName.StartsWith("~/"))
                 fileName = fileName.Substring(2);
 
-			if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName)))
-			{
-			  
-				UserControl oControl = (UserControl)this.Page.LoadControl(@"~/" + fileName);
+            if (System.IO.File.Exists(IOHelper.MapPath("~/" + fileName)))
+            {
 
-				Type type = oControl.GetType();
+                UserControl oControl = (UserControl)this.Page.LoadControl(@"~/" + fileName);
+
+                Type type = oControl.GetType();
 
 
-				Dictionary<string, DataEditorSetting> settings = GetSettings(type);
+                Dictionary<string, DataEditorSetting> settings = GetSettings(type);
 
-				foreach (KeyValuePair<string, DataEditorSetting> kv in settings)
-				{
-					DataEditorSettingType dst = kv.Value.GetDataEditorSettingType();
-					dtSettings.Add(kv.Key, dst);
+                foreach (KeyValuePair<string, DataEditorSetting> kv in settings)
+                {
+                    DataEditorSettingType dst = kv.Value.GetDataEditorSettingType();
+                    dtSettings.Add(kv.Key, dst);
 
-					DataEditorPropertyPanel panel = new DataEditorPropertyPanel();
-					panel.Text = kv.Value.GetName();
-					panel.Text += "<br/><small>" + kv.Value.description + "</small>";
+                    DataEditorPropertyPanel panel = new DataEditorPropertyPanel();
+                    panel.Text = kv.Value.GetName();
+                    panel.Text += "<br/><small>" + kv.Value.description + "</small>";
 
 
-					if (HasSettings(type))
-					{
-						DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
+                    if (HasSettings(type))
+                    {
+                        DataEditorSettingsStorage ss = new DataEditorSettingsStorage();
 
-						List<Setting<string, string>> s = ss.GetSettings(_datatype.DataTypeDefinitionId);
-						ss.Dispose();
+                        List<Setting<string, string>> s = ss.GetSettings(_datatype.DataTypeDefinitionId);
+                        ss.Dispose();
 
-						if (s.Find(set => set.Key == kv.Key).Value != null)
-							dst.Value = s.Find(set => set.Key == kv.Key).Value;
+                        if (s.Find(set => set.Key == kv.Key).Value != null)
+                            dst.Value = s.Find(set => set.Key == kv.Key).Value;
 
-					}
+                    }
 
-					panel.Controls.Add(dst.RenderControl(kv.Value));
+                    panel.Controls.Add(dst.RenderControl(kv.Value));
 
-					Label invalid = new Label();
-					invalid.Attributes.Add("style", "color:#8A1F11");
-					invalid.ID = "lbl" + kv.Key;
-					panel.Controls.Add(invalid);
+                    Label invalid = new Label();
+                    invalid.Attributes.Add("style", "color:#8A1F11");
+                    invalid.ID = "lbl" + kv.Key;
+                    panel.Controls.Add(invalid);
 
-					_phSettings.Controls.Add(panel);
-					
-				}
-			}
-		}
+                    _phSettings.Controls.Add(panel);
+
+                }
+            }
+        }
 
 		public void Save()
 		{
@@ -247,23 +251,25 @@ namespace umbraco.editorControls.userControlGrapper
 				// Generate data-string
 				string data = _dropdownlistUserControl.SelectedValue;
 
-				// If the add new prevalue textbox is filled out - add the value to the collection.
-				IParameter[] SqlParams = new IParameter[]
-											 {
-												 SqlHelper.CreateParameter("@value", data),
-												 SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
-											 };
-				SqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
-				// we need to populate the parameters again due to an issue with SQL CE
-				SqlParams = new IParameter[]
-								{
-									SqlHelper.CreateParameter("@value", data),
-									SqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
-								};
-				SqlHelper.ExecuteNonQuery(
-					"insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
-					SqlParams);
-
+                // If the add new prevalue textbox is filled out - add the value to the collection.
+                using (var sqlHelper = Application.SqlHelper)
+                {
+                    IParameter[] SqlParams = new IParameter[]
+                                                 {
+                                                     sqlHelper.CreateParameter("@value", data),
+                                                     sqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
+                                                 };
+                    sqlHelper.ExecuteNonQuery("delete from cmsDataTypePreValues where datatypenodeid = @dtdefid", SqlParams);
+                    // we need to populate the parameters again due to an issue with SQL CE
+                    SqlParams = new IParameter[]
+                                    {
+                                        sqlHelper.CreateParameter("@value", data),
+                                        sqlHelper.CreateParameter("@dtdefid", _datatype.DataTypeDefinitionId)
+                                    };
+                    sqlHelper.ExecuteNonQuery(
+                        "insert into cmsDataTypePreValues (datatypenodeid,[value],sortorder,alias) values (@dtdefid,@value,0,'')",
+                        SqlParams);
+                }
 
 				//settings
 
@@ -290,35 +296,36 @@ namespace umbraco.editorControls.userControlGrapper
 			}
 		}
 
-		protected override void Render(HtmlTextWriter writer)
-		{
-			writer.WriteLine("<div class=\"propertyItem\">");
-			writer.WriteLine("<div class=\"propertyItemheader\">Database datatype</div>");
-			writer.WriteLine("<div class=\"propertyItemContent\">");
-			_dropdownlist.RenderControl(writer);
-			writer.Write("</div></div>");
+        protected override void Render(HtmlTextWriter writer)
+        {
+            writer.WriteLine("<div class=\"propertyItem\">");
+            writer.WriteLine("<div class=\"propertyItemheader\">Database datatype</div>");
+            writer.WriteLine("<div class=\"propertyItemContent\">");
+            _dropdownlist.RenderControl(writer);
+            writer.Write("</div></div>");
 
-			writer.WriteLine("<div class=\"propertyItem\">");
-			writer.WriteLine("<div class=\"propertyItemheader\">Usercontrol:</div>");
-			writer.WriteLine("<div class=\"propertyItemContent\">");
-			_dropdownlistUserControl.RenderControl(writer);
-			writer.Write("</div></div>");
+            writer.WriteLine("<div class=\"propertyItem\">");
+            writer.WriteLine("<div class=\"propertyItemheader\">Usercontrol:</div>");
+            writer.WriteLine("<div class=\"propertyItemContent\">");
+            _dropdownlistUserControl.RenderControl(writer);
+            writer.Write("</div></div>");
 
-			_phSettings.RenderControl(writer);
-		}
+            _phSettings.RenderControl(writer);
+        }
 
 		public string Configuration
 		{
 			get
 			{
-				object conf =
-					SqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
-											SqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
-				if (conf != null)
-					return conf.ToString();
-				else
-					return "";
-
+                using (var sqlHelper = Application.SqlHelper) { 
+                    object conf =
+					    sqlHelper.ExecuteScalar<object>("select value from cmsDataTypePreValues where datatypenodeid = @datatypenodeid",
+											    sqlHelper.CreateParameter("@datatypenodeid", _datatype.DataTypeDefinitionId));
+				    if (conf != null)
+					    return conf.ToString();
+				    else
+					    return "";
+                }
 			}
 		}
 

From 3a216c055e4fa6dc6741bc30a4579aad6085450f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Nov 2016 09:52:45 +0100
Subject: [PATCH 32/52] U4-9222 - use HasPublishedVersion test

---
 .../umbraco.presentation/content.cs           | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs
index 26076f8727..b232d434b1 100644
--- a/src/Umbraco.Web/umbraco.presentation/content.cs
+++ b/src/Umbraco.Web/umbraco.presentation/content.cs
@@ -50,7 +50,7 @@ namespace umbraco
                 var profingLogger = new ProfilingLogger(
                     logger,
                     ProfilerResolver.HasCurrent ? ProfilerResolver.Current.Profiler : new LogProfiler(logger));
- 
+
                 // prepare the persister task
                 // there's always be one task keeping a ref to the runner
                 // so it's safe to just create it as a local var here
@@ -71,7 +71,7 @@ namespace umbraco
                         // once released, the cache still works but does not write to file anymore,
                         // which is OK with database server messenger but will cause data loss with
                         // another messenger...
-                        
+
                         runner.Shutdown(false, true); // wait until flushed
                         _released = true;
                     });
@@ -145,7 +145,7 @@ namespace umbraco
         }
 
         //NOTE: We CANNOT use this for a double check lock because it is a property, not a field and to do double
-        // check locking in c# you MUST have a volatile field. Even thoug this wraps a volatile field it will still 
+        // check locking in c# you MUST have a volatile field. Even thoug this wraps a volatile field it will still
         // not work as expected for a double check lock because properties are treated differently in the clr.
         public virtual bool isInitializing
         {
@@ -323,22 +323,17 @@ namespace umbraco
             // this updates the published cache to take care of the situation
             // without ContentService having to ... what exactly?
 
-            // no need to do it if the content is published without unpublished changes,
-            // though, because in that case the XML will get re-generated with the
-            // correct sort order.
-            if (c.Published)
-                return;
-
-            //if it's a brand new entity, then this shouldn't affect the sort order of the document
-            if (c.IsNewEntity())
-                return;
-
-            //if the sort order didn't change and the published state didn't change then we don't need to continue
-            if (c.WasPropertyDirty("SortOrder") == false
-                && c.WasPropertyDirty("Published") == false)
-            {
-                return;
-            }
+            // no need to do it if
+            // - the content is published without unpublished changes (XML will be re-gen anyways)
+            // - the content has no published version (not in XML)
+            // - the sort order has not changed
+            // note that
+            // - if it is a new entity is has not published version
+            // - if Published is dirty and false it's getting unpublished and has no published version
+            //
+            if (c.Published) return;
+            if (c.HasPublishedVersion == false) return;
+            if (c.WasPropertyDirty("SortOrder") == false) return;
 
             using (var safeXml = GetSafeXmlWriter(false))
             {
@@ -426,7 +421,7 @@ namespace umbraco
             {
                 XmlNode x;
 
-                // remove from xml db cache 
+                // remove from xml db cache
                 doc.XmlRemoveFromDB();
 
                 // clear xml cache
@@ -442,7 +437,7 @@ namespace umbraco
                 {
                     var prov = (UmbracoSiteMapProvider)SiteMap.Provider;
                     prov.RemoveNode(doc.Id);
-                }                
+                }
             }
         }
 
@@ -493,7 +488,7 @@ namespace umbraco
             if (UmbracoContext.Current != null && UmbracoContext.Current.HttpContext != null && UmbracoContext.Current.HttpContext.Items.Contains(XmlContextContentItemKey))
                 UmbracoContext.Current.HttpContext.Items.Remove(XmlContextContentItemKey);
         }
-        
+
         /// <summary>
         /// Load content from database
         /// </summary>
@@ -524,7 +519,7 @@ namespace umbraco
         public void PersistXmlToFile()
         {
         }
-        
+
         internal DateTime GetCacheFileUpdateTime()
         {
             //TODO: Should there be a try/catch here in case the file is being written to while this is trying to be executed?
@@ -573,7 +568,7 @@ namespace umbraco
         private static bool UseLegacySchema
         {
             get { return UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema; }
-        }        
+        }
 
         #endregion
 
@@ -777,9 +772,9 @@ namespace umbraco
                 _releaser.Dispose();
                 _releaser = null;
             }
-            
+
         }
-                
+
         private static string ChildNodesXPath
         {
             get
@@ -873,9 +868,9 @@ namespace umbraco
             // and in addition, writing async is never fully async because
             // althouth the writer is async, xml.WriteTo() will not async
 
-            // that one almost works but... "The elements are indented as long as the element 
+            // that one almost works but... "The elements are indented as long as the element
             // does not contain mixed content. Once the WriteString or WriteWhitespace method
-            // is called to write out a mixed element content, the XmlWriter stops indenting. 
+            // is called to write out a mixed element content, the XmlWriter stops indenting.
             // The indenting resumes once the mixed content element is closed." - says MSDN
             // about XmlWriterSettings.Indent
 
@@ -1080,7 +1075,7 @@ namespace umbraco
             //TODO: This could be faster, might as well just iterate all children and filter
             // instead of selecting matching children (i.e. iterating all) and then iterating the
             // filtered items to remove, this also allocates more memory to store the list of children.
-            // Below we also then do another filtering of child nodes, if we just iterate all children we 
+            // Below we also then do another filtering of child nodes, if we just iterate all children we
             // can perform both functions more efficiently
             var dataNodes = publishedNode.SelectNodes(DataNodesXPath);
             if (dataNodes == null) throw new Exception("oops");

From 184a01b64dcd35f6964f96a0587db1767888456f Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Nov 2016 10:08:57 +0100
Subject: [PATCH 33/52] U4-9201 - fixes

---
 src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs | 6 ++++++
 src/Umbraco.Core/Umbraco.Core.csproj                   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index 2ffee29490..140540ed4c 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -150,9 +150,15 @@ namespace Umbraco.Core.Persistence
             {
                 case ContextOwner.CallContext:
                     NonContextValue = null;
+#if DEBUG_DATABASES
+                    Log("Clr lcc", disposing);
+#endif
                     break;
                 case ContextOwner.HttpContext:
                     HttpContext.Current.Items.Remove(typeof(DefaultDatabaseFactory));
+#if DEBUG_DATABASES
+                    Log("Clr ctx", disposing);
+#endif
                     break;
             }
 
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 24d889a06f..7cee18e5f0 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -21,7 +21,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;DEBUG_DATABASES</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>

From 48dbd5c57050245ea9b51b31f13a6a89cfee642c Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 24 Nov 2016 17:37:20 +0100
Subject: [PATCH 34/52] Ensure CacheRefresherEventHandler triggers first

---
 src/Umbraco.Core/Events/EventExtensions.cs    | 33 ++++++++++++-
 .../Cache/CacheRefresherEventHandler.cs       | 49 ++++++++++---------
 2 files changed, 58 insertions(+), 24 deletions(-)

diff --git a/src/Umbraco.Core/Events/EventExtensions.cs b/src/Umbraco.Core/Events/EventExtensions.cs
index 700a02457a..bd66b605fd 100644
--- a/src/Umbraco.Core/Events/EventExtensions.cs
+++ b/src/Umbraco.Core/Events/EventExtensions.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Reflection;
 
 namespace Umbraco.Core.Events
 {
@@ -47,5 +48,35 @@ namespace Umbraco.Core.Events
 			if (eventHandler != null)
 				eventHandler(sender, args);
 		}
-	}
+
+        // moves the last handler that was added to an instance event, to first position
+	    public static void PromoteLastHandler(object sender, string eventName)
+	    {
+            var fieldInfo = sender.GetType().GetField(eventName, BindingFlags.Instance | BindingFlags.NonPublic);
+            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
+            PromoteLastHandler(sender, fieldInfo);
+        }
+
+        // moves the last handler that was added to a static event, to first position
+        public static void PromoteLastHandler<TSender>(string eventName)
+        {
+            var fieldInfo = typeof(TSender).GetField(eventName, BindingFlags.Static | BindingFlags.NonPublic);
+            if (fieldInfo == null) throw new InvalidOperationException("No event named " + eventName + ".");
+            PromoteLastHandler(null, fieldInfo);
+        }
+
+	    private static void PromoteLastHandler(object sender, FieldInfo fieldInfo)
+	    {
+            var d = fieldInfo.GetValue(sender) as Delegate;
+	        if (d == null) return;
+
+            var l = d.GetInvocationList();
+            var x = l[l.Length - 1];
+            for (var i = l.Length - 1; i > 0; i--)
+                l[i] = l[i - 1];
+            l[0] = x;
+
+            fieldInfo.SetValue(sender, Delegate.Combine(l));
+        }
+    }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index 791318d8ab..b41afebb74 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -9,8 +9,10 @@ using Umbraco.Core.Services;
 using umbraco.BusinessLogic;
 using umbraco.cms.businesslogic;
 using System.Linq;
+using System.Reflection;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Publishing;
 using Content = Umbraco.Core.Models.Content;
 using ApplicationTree = Umbraco.Core.Models.ApplicationTree;
@@ -21,6 +23,7 @@ namespace Umbraco.Web.Cache
     /// <summary>
     /// Class which listens to events on business level objects in order to invalidate the cache amongst servers when data changes
     /// </summary>
+    [WeightedPlugin(int.MinValue)]
     public class CacheRefresherEventHandler : ApplicationEventHandler
     {
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
@@ -104,14 +107,14 @@ namespace Umbraco.Web.Cache
 
             //Bind to media events
 
-            MediaService.Saved += MediaServiceSaved;            
+            MediaService.Saved += MediaServiceSaved;
             MediaService.Deleted += MediaServiceDeleted;
             MediaService.Moved += MediaServiceMoved;
             MediaService.Trashed += MediaServiceTrashed;
             MediaService.EmptiedRecycleBin += MediaServiceEmptiedRecycleBin;
 
             //Bind to content events - this is for unpublished content syncing across servers (primarily for examine)
-            
+
             ContentService.Saved += ContentServiceSaved;
             ContentService.Deleted += ContentServiceDeleted;
             ContentService.Copied += ContentServiceCopied;
@@ -231,7 +234,7 @@ namespace Umbraco.Web.Cache
                 DistributedCache.Instance.RemoveUnpublishedCachePermanently(e.Ids.ToArray());
             }
         }
-        
+
         /// <summary>
         /// Handles cache refreshing for when content is trashed
         /// </summary>
@@ -253,7 +256,7 @@ namespace Umbraco.Web.Cache
         /// <param name="sender"></param>
         /// <param name="e"></param>
         /// <remarks>
-        /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the 
+        /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the
         /// case then we need to clear all user permissions cache.
         /// </remarks>
         static void ContentServiceCopied(IContentService sender, CopyEventArgs<IContent> e)
@@ -285,10 +288,10 @@ namespace Umbraco.Web.Cache
         /// <param name="sender"></param>
         /// <param name="e"></param>
         /// <remarks>
-        /// When an entity is saved we need to notify other servers about the change in order for the Examine indexes to 
+        /// When an entity is saved we need to notify other servers about the change in order for the Examine indexes to
         /// stay up-to-date for unpublished content.
-        /// 
-        /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the 
+        ///
+        /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the
         /// case then we need to clear all user permissions cache.
         /// </remarks>
         static void ContentServiceSaved(IContentService sender, SaveEventArgs<IContent> e)
@@ -303,8 +306,8 @@ namespace Umbraco.Web.Cache
                     var permissionsChanged = ((Content)x).WasPropertyDirty("PermissionsChanged");
                     if (permissionsChanged)
                     {
-                        clearUserPermissions = true;                        
-                    }    
+                        clearUserPermissions = true;
+                    }
                 }
             });
 
@@ -337,7 +340,7 @@ namespace Umbraco.Web.Cache
         static void ApplicationTreeDeleted(ApplicationTree sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationTreeCache();
-        } 
+        }
         #endregion
 
         #region Application event handlers
@@ -349,7 +352,7 @@ namespace Umbraco.Web.Cache
         static void ApplicationDeleted(Section sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationCache();
-        } 
+        }
         #endregion
 
         #region UserType event handlers
@@ -362,9 +365,9 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshUserTypeCache(x.Id));
         }
-        
+
         #endregion
-        
+
         #region Dictionary event handlers
 
         static void LocalizationServiceSavedDictionaryItem(ILocalizationService sender, SaveEventArgs<IDictionaryItem> e)
@@ -390,11 +393,11 @@ namespace Umbraco.Web.Cache
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveDataTypeCache(x));
         }
 
-   
+
         #endregion
 
         #region Stylesheet and stylesheet property event handlers
-     
+
         static void FileServiceDeletedStylesheet(IFileService sender, DeleteEventArgs<Stylesheet> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveStylesheetCache(x));
@@ -441,7 +444,7 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshLanguageCache(x));
         }
-      
+
         #endregion
 
         #region Content/media/member Type event handlers
@@ -505,9 +508,9 @@ namespace Umbraco.Web.Cache
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshMemberTypeCache(x));
         }
 
-        
+
         #endregion
-        
+
         #region User/permissions event handlers
 
         static void CacheRefresherEventHandler_AssignedPermissions(PermissionRepository<IContent> sender, SaveEventArgs<EntityPermission> e)
@@ -540,7 +543,7 @@ namespace Umbraco.Web.Cache
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveUserCache(x.Id));
         }
-        
+
         private static void InvalidateCacheForPermissionsChange(UserPermission sender)
         {
             if (sender.User != null)
@@ -580,7 +583,7 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshTemplateCache(x.Id));
         }
-      
+
         #endregion
 
         #region Macro event handlers
@@ -600,7 +603,7 @@ namespace Umbraco.Web.Cache
                 DistributedCache.Instance.RefreshMacroCache(entity);
             }
         }
-  
+
         #endregion
 
         #region Media event handlers
@@ -631,14 +634,14 @@ namespace Umbraco.Web.Cache
         static void MediaServiceSaved(IMediaService sender, SaveEventArgs<IMedia> e)
         {
             DistributedCache.Instance.RefreshMediaCache(e.SavedEntities.ToArray());
-        } 
+        }
         #endregion
 
         #region Member event handlers
 
         static void MemberServiceDeleted(IMemberService sender, DeleteEventArgs<IMember> e)
         {
-            DistributedCache.Instance.RemoveMemberCache(e.DeletedEntities.ToArray());    
+            DistributedCache.Instance.RemoveMemberCache(e.DeletedEntities.ToArray());
         }
 
         static void MemberServiceSaved(IMemberService sender, SaveEventArgs<IMember> e)

From c505cc689b413206b3b2c9d52c50f92682fa0502 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 28 Nov 2016 12:03:46 +0100
Subject: [PATCH 35/52] Obsoletes access to ApplicationContext from
 UmbracoContext

---
 src/Umbraco.Web/UmbracoContext.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Web/UmbracoContext.cs b/src/Umbraco.Web/UmbracoContext.cs
index 8d56a81084..d878ac3d1d 100644
--- a/src/Umbraco.Web/UmbracoContext.cs
+++ b/src/Umbraco.Web/UmbracoContext.cs
@@ -324,6 +324,8 @@ namespace Umbraco.Web
         /// <summary>
         /// Gets the current ApplicationContext
         /// </summary>
+        [Obsolete("Do not access the ApplicationContext via the UmbracoContext, either inject the ApplicationContext into the services you need or access it via it's own Singleton accessor ApplicationContext.Current")]
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public ApplicationContext Application { get; private set; }
 
         /// <summary>

From f7aee1c12f6144b5aede2ea5a77d36cb5de17240 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Nov 2016 12:49:55 +0100
Subject: [PATCH 36/52] Version 7.6.0-alpha031

---
 src/SolutionInfo.cs                              | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 8a38c089c9..80382c52aa 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha028")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.6.0-alpha031")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index 17d9c95e0a..d534ba314a 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "alpha028"; } }
+        public static string CurrentComment { get { return "alpha031"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

From 3e8f85a4b4f89083162d3c955ccc84b74351af95 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Thu, 1 Dec 2016 14:30:50 +0100
Subject: [PATCH 37/52] Be more tolerant with Xml cache document

---
 .../XmlPublishedCache/PublishedContentCache.cs             | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
index 83a4606d19..00782f097e 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
@@ -217,15 +217,18 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             get { return UmbracoConfig.For.UmbracoSettings().Content.UseLegacyXmlSchema; }
         }
 
-        private int NavigateElementRoute(XmlElement elt, string[] urlParts)
+        private static int NavigateElementRoute(XmlElement elt, string[] urlParts)
         {
             var found = true;
             var i = 0;
             while (found && i < urlParts.Length)
             {
                 found = false;
-                foreach (XmlElement child in elt.ChildNodes)
+                foreach (XmlNode childNode in elt.ChildNodes)
                 {
+                    var child = childNode as XmlElement;
+                    if (child == null) continue; // be safe
+
                     var noNode = UseLegacySchema
                         ? child.Name != "node"
                         : child.GetAttributeNode("isDoc") == null;

From 006ee00527c41fc0f6cccbaba4ce8955ef7b2e74 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Fri, 2 Dec 2016 13:05:45 +1100
Subject: [PATCH 38/52] Ensures that all weight's for startup handlers that are
 in a Core namespace have a -100 default applied, all public ones by default
 will have 100 applied. Allows for developers to use the reserved negative
 numbers if they must - but we need to doc this!

---
 .../ApplicationEventsResolver.cs              | 80 +++++++++----------
 .../ObjectResolution/WeightAttribute.cs       | 14 +---
 2 files changed, 39 insertions(+), 55 deletions(-)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 6cb60e2df0..3537d47a00 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -53,20 +53,28 @@ namespace Umbraco.Core.ObjectResolution
 	            if (_orderedAndFiltered == null)
 	            {
 	                _resolved = true;
-                    _orderedAndFiltered = GetSortedValues().ToList();                    
-                    OnCollectionResolved(_orderedAndFiltered);
+                    _orderedAndFiltered = GetSortedValues().ToList();
+
+                    //call the callback if one is applied
+                    if (FilterCollection != null)
+                    {
+                        FilterCollection(_orderedAndFiltered);
+                    }
                 }
 	            return _orderedAndFiltered;
 	        }
 		}
-
-	    /// <summary>
-	    /// A delegate that can be set in the pre-boot phase in order to filter or re-order the event handler collection
-	    /// </summary>
-	    /// <remarks>
-	    /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
-	    /// </remarks>
-	    public Action<IList<IApplicationEventHandler>> FilterCollection
+        
+        /// <summary>
+        /// EXPERT: Allow a delegate to be set to filters the event handler list
+        /// </summary>
+        /// <remarks>
+        /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing.
+        /// Primarily this is used for custom boot sequences where the custom boot loader may need to remove certain startup
+        /// handlers from executing. 
+        /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
+        /// </remarks>
+        public Action<IList<IApplicationEventHandler>> FilterCollection
 	    {
 	        get { return _filterCollection; }
 	        set
@@ -80,41 +88,29 @@ namespace Umbraco.Core.ObjectResolution
 	        }
 	    }
 
-	    /// <summary>
-	    /// Allow any filters to be applied to the event handler list
-	    /// </summary>
-	    /// <param name="handlers"></param>
-	    /// <remarks>
-	    /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing,
-	    /// however this also ensures that any core handlers are executed first to ensure the stabiliy of Umbraco.
-	    /// </remarks>
-	    private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
-        {
-            if (FilterCollection != null)
-            {
-                FilterCollection(handlers);
-            }
+        /// <summary>
+        /// This will get the object weight for the plugin
+        /// </summary>
+        /// <param name="o"></param>
+        /// <returns></returns>
+        /// <remarks>
+        /// For event handlers, all Core event handlers that are not attributed will result in a -100 value
+        /// </remarks>
+	    protected override int GetObjectWeight(object o)
+	    {
+            var type = o.GetType();
+            var attr = type.GetCustomAttribute<WeightAttribute>(true);
 
-            //find all of the core handlers and their weight, remove them from the main list
-            var coreItems = new List<Tuple<IApplicationEventHandler, int>>();
-            foreach (var handler in handlers.ToArray())
-            {
-                //Yuck, but not sure what else we can do 
-                if (
-                    handler.GetType().Assembly.FullName.StartsWith("Umbraco.", StringComparison.OrdinalIgnoreCase)
-                    || handler.GetType().Assembly.FullName.StartsWith("Concorde."))
-                {
-                    coreItems.Add(new Tuple<IApplicationEventHandler, int>(handler, GetObjectWeight(handler)));
-                    handlers.Remove(handler);
-                }
-            }
+	        if (attr == null &&
+	            (o.GetType().Assembly.FullName.StartsWith("Umbraco.", StringComparison.OrdinalIgnoreCase)
+	             || o.GetType().Assembly.FullName.StartsWith("Concorde.")))
+	        {
+	            return -100;
+	        }
 
-            //re-add the core handlers to the beginning of the list ordered by their weight
-            foreach (var coreHandler in coreItems.OrderBy(x => x.Item2))
-            {
-                handlers.Insert(0, coreHandler.Item1);
-            }            
+	        return attr == null ? DefaultPluginWeight : attr.Weight;
         }
+        
 
         /// <summary>
         /// Create instances of all of the legacy startup handlers
diff --git a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
index 35f10a4111..067df5700c 100644
--- a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
+++ b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
@@ -15,23 +15,11 @@ namespace Umbraco.Core.ObjectResolution
 		/// <remarks>
 		/// This internal constructor allows for internal Umbraco products to set a negative number weight
 		/// </remarks>
-	    internal WeightAttribute(int weight)
+	    public WeightAttribute(int weight)
 	    {
 	        Weight = weight;
 	    }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
-		/// </summary>
-		/// <param name="weight">The object type weight.</param>
-		/// <remarks>
-		/// The weight must be a positive number
-		/// </remarks>
-		public WeightAttribute(uint weight)
-		{
-			Weight = Convert.ToInt32(weight);
-		}
-
 		/// <summary>
 		/// Gets or sets the weight of the object type.
 		/// </summary>

From 13f7f96101f66821e8f4d465803caf29a397f69e Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 28 Nov 2016 09:38:50 +0100
Subject: [PATCH 39/52] Refactor app event resolver weights

---
 .../ApplicationEventsResolver.cs              | 82 ++++++++-----------
 .../ObjectResolution/WeightAttribute.cs       | 17 +---
 .../Cache/CacheRefresherEventHandler.cs       | 48 +++++------
 3 files changed, 59 insertions(+), 88 deletions(-)

diff --git a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
index 6cb60e2df0..eda1b94e37 100644
--- a/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
+++ b/src/Umbraco.Core/ObjectResolution/ApplicationEventsResolver.cs
@@ -11,7 +11,13 @@ namespace Umbraco.Core.ObjectResolution
 	/// A resolver to return all IApplicationEvents objects
 	/// </summary>
 	/// <remarks>
-	/// This is disposable because after the app has started it should be disposed to release any memory being occupied by instances.
+	/// <para>This is disposable because after the app has started it should be disposed to release any memory being occupied by instances.</para>
+	/// <para>Ordering handlers: handlers are ordered by (ascending) weight. By default, handlers from the Umbraco.* or Concorde.*
+	/// assemblies have a -100 weight whereas any other handler has a weight of +100. A custom weight can be assigned to a handler
+	/// by marking the class with the WeightAttribute. For example, the CacheRefresherEventHandler is marked with [Weight(int.MinValue)]
+	/// because its events need to run before anything else. Positive weights are considered "user-space" while negative weights are
+	/// "core". Finally, users can register a filter to process the list (after it has been ordered) and re-order it, or remove handlers.</para>
+	/// <para>BEWARE! handlers order is an important thing, and removing handlers or reordering handlers can have unexpected consequences.</para>
 	/// </remarks>
     public sealed class ApplicationEventsResolver : ManyObjectsResolverBase<ApplicationEventsResolver, IApplicationEventHandler>, IDisposable
 	{
@@ -25,9 +31,9 @@ namespace Umbraco.Core.ObjectResolution
 	    /// <param name="serviceProvider"></param>
 	    internal ApplicationEventsResolver(IServiceProvider serviceProvider, ILogger logger, IEnumerable<Type> applicationEventHandlers)
             : base(serviceProvider, logger, applicationEventHandlers)
-		{
+	    {
             //create the legacy resolver and only include the legacy types
-	        _legacyResolver = new LegacyStartupHandlerResolver(
+            _legacyResolver = new LegacyStartupHandlerResolver(
                 serviceProvider, logger,
 	            applicationEventHandlers.Where(x => TypeHelper.IsTypeAssignableFrom<IApplicationEventHandler>(x) == false));
 		}
@@ -52,26 +58,29 @@ namespace Umbraco.Core.ObjectResolution
 	        {
 	            if (_orderedAndFiltered == null)
 	            {
-	                _resolved = true;
-                    _orderedAndFiltered = GetSortedValues().ToList();                    
-                    OnCollectionResolved(_orderedAndFiltered);
+                    _orderedAndFiltered = GetSortedValues().ToList();
+                    if (FilterCollection != null)
+                        FilterCollection(_orderedAndFiltered);
                 }
 	            return _orderedAndFiltered;
 	        }
 		}
 
-	    /// <summary>
-	    /// A delegate that can be set in the pre-boot phase in order to filter or re-order the event handler collection
-	    /// </summary>
-	    /// <remarks>
-	    /// This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication)
-	    /// </remarks>
-	    public Action<IList<IApplicationEventHandler>> FilterCollection
+        /// <summary>
+        /// Gets or sets a delegate to filter the event handler list (EXPERT!).
+        /// </summary>
+        /// <remarks>
+        /// <para>This can be set on startup in the pre-boot process in either a custom boot manager or global.asax (UmbracoApplication).</para>
+        /// <para>Allows custom logic to execute in order to filter and/or re-order the event handlers prior to executing.</para>
+        /// <para>To be used by custom boot sequences where the boot loader needs to remove some handlers, or raise their priority.</para>
+        /// <para>Filtering the event handler collection can have ugly consequences. Use with care.</para>
+        /// </remarks>
+        public Action<IList<IApplicationEventHandler>> FilterCollection
 	    {
 	        get { return _filterCollection; }
 	        set
 	        {
-                if (_resolved)
+                if (_orderedAndFiltered != null)
                     throw new InvalidOperationException("Cannot set the FilterCollection delegate once the ApplicationEventHandlers are resolved");
                 if (_filterCollection != null)
                     throw new InvalidOperationException("Cannot set the FilterCollection delegate once it's already been specified");
@@ -80,40 +89,16 @@ namespace Umbraco.Core.ObjectResolution
 	        }
 	    }
 
-	    /// <summary>
-	    /// Allow any filters to be applied to the event handler list
-	    /// </summary>
-	    /// <param name="handlers"></param>
-	    /// <remarks>
-	    /// This allows custom logic to execute in order to filter or re-order the event handlers prior to executing,
-	    /// however this also ensures that any core handlers are executed first to ensure the stabiliy of Umbraco.
-	    /// </remarks>
-	    private void OnCollectionResolved(List<IApplicationEventHandler> handlers)
-        {
-            if (FilterCollection != null)
-            {
-                FilterCollection(handlers);
-            }
+	    protected override int GetObjectWeight(object o)
+	    {
+            var type = o.GetType();
+            var attr = type.GetCustomAttribute<WeightAttribute>(true);
+            if (attr != null) return attr.Weight;
+            var name = type.Assembly.FullName;
 
-            //find all of the core handlers and their weight, remove them from the main list
-            var coreItems = new List<Tuple<IApplicationEventHandler, int>>();
-            foreach (var handler in handlers.ToArray())
-            {
-                //Yuck, but not sure what else we can do 
-                if (
-                    handler.GetType().Assembly.FullName.StartsWith("Umbraco.", StringComparison.OrdinalIgnoreCase)
-                    || handler.GetType().Assembly.FullName.StartsWith("Concorde."))
-                {
-                    coreItems.Add(new Tuple<IApplicationEventHandler, int>(handler, GetObjectWeight(handler)));
-                    handlers.Remove(handler);
-                }
-            }
-
-            //re-add the core handlers to the beginning of the list ordered by their weight
-            foreach (var coreHandler in coreItems.OrderBy(x => x.Item2))
-            {
-                handlers.Insert(0, coreHandler.Item1);
-            }            
+            // we should really attribute all our Core handlers, so this is temp
+            var core = name.InvariantStartsWith("Umbraco.") || name.InvariantStartsWith("Concorde.");
+            return core ? -DefaultPluginWeight : DefaultPluginWeight;
         }
 
         /// <summary>
@@ -157,7 +142,6 @@ namespace Umbraco.Core.ObjectResolution
 	    private bool _disposed;
 		private readonly ReaderWriterLockSlim _disposalLocker = new ReaderWriterLockSlim();
 	    private Action<IList<IApplicationEventHandler>> _filterCollection;
-	    private bool _resolved = false;
 
 	    /// <summary>
 		/// Gets a value indicating whether this instance is disposed.
@@ -215,7 +199,7 @@ namespace Umbraco.Core.ObjectResolution
             _legacyResolver.Dispose();
             ResetCollections();
             _orderedAndFiltered.Clear();
-	        _orderedAndFiltered = null;            
+	        _orderedAndFiltered = null;
 	    }
     }
 }
\ No newline at end of file
diff --git a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
index 35f10a4111..16d18fb7b7 100644
--- a/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
+++ b/src/Umbraco.Core/ObjectResolution/WeightAttribute.cs
@@ -12,26 +12,11 @@ namespace Umbraco.Core.ObjectResolution
 		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
 		/// </summary>
 		/// <param name="weight">The object type weight.</param>
-		/// <remarks>
-		/// This internal constructor allows for internal Umbraco products to set a negative number weight
-		/// </remarks>
-	    internal WeightAttribute(int weight)
+	    public WeightAttribute(int weight)
 	    {
 	        Weight = weight;
 	    }
 
-		/// <summary>
-		/// Initializes a new instance of the <see cref="WeightAttribute"/> class with a weight.
-		/// </summary>
-		/// <param name="weight">The object type weight.</param>
-		/// <remarks>
-		/// The weight must be a positive number
-		/// </remarks>
-		public WeightAttribute(uint weight)
-		{
-			Weight = Convert.ToInt32(weight);
-		}
-
 		/// <summary>
 		/// Gets or sets the weight of the object type.
 		/// </summary>
diff --git a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
index 791318d8ab..78b211ee7c 100644
--- a/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
+++ b/src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
@@ -11,6 +11,7 @@ using umbraco.cms.businesslogic;
 using System.Linq;
 using umbraco.cms.businesslogic.web;
 using Umbraco.Core.Logging;
+using Umbraco.Core.ObjectResolution;
 using Umbraco.Core.Publishing;
 using Content = Umbraco.Core.Models.Content;
 using ApplicationTree = Umbraco.Core.Models.ApplicationTree;
@@ -21,6 +22,7 @@ namespace Umbraco.Web.Cache
     /// <summary>
     /// Class which listens to events on business level objects in order to invalidate the cache amongst servers when data changes
     /// </summary>
+    [Weight(int.MinValue)]
     public class CacheRefresherEventHandler : ApplicationEventHandler
     {
         protected override void ApplicationStarted(UmbracoApplicationBase umbracoApplication, ApplicationContext applicationContext)
@@ -104,14 +106,14 @@ namespace Umbraco.Web.Cache
 
             //Bind to media events
 
-            MediaService.Saved += MediaServiceSaved;            
+            MediaService.Saved += MediaServiceSaved;
             MediaService.Deleted += MediaServiceDeleted;
             MediaService.Moved += MediaServiceMoved;
             MediaService.Trashed += MediaServiceTrashed;
             MediaService.EmptiedRecycleBin += MediaServiceEmptiedRecycleBin;
 
             //Bind to content events - this is for unpublished content syncing across servers (primarily for examine)
-            
+
             ContentService.Saved += ContentServiceSaved;
             ContentService.Deleted += ContentServiceDeleted;
             ContentService.Copied += ContentServiceCopied;
@@ -231,7 +233,7 @@ namespace Umbraco.Web.Cache
                 DistributedCache.Instance.RemoveUnpublishedCachePermanently(e.Ids.ToArray());
             }
         }
-        
+
         /// <summary>
         /// Handles cache refreshing for when content is trashed
         /// </summary>
@@ -253,7 +255,7 @@ namespace Umbraco.Web.Cache
         /// <param name="sender"></param>
         /// <param name="e"></param>
         /// <remarks>
-        /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the 
+        /// When an entity is copied new permissions may be assigned to it based on it's parent, if that is the
         /// case then we need to clear all user permissions cache.
         /// </remarks>
         static void ContentServiceCopied(IContentService sender, CopyEventArgs<IContent> e)
@@ -285,10 +287,10 @@ namespace Umbraco.Web.Cache
         /// <param name="sender"></param>
         /// <param name="e"></param>
         /// <remarks>
-        /// When an entity is saved we need to notify other servers about the change in order for the Examine indexes to 
+        /// When an entity is saved we need to notify other servers about the change in order for the Examine indexes to
         /// stay up-to-date for unpublished content.
-        /// 
-        /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the 
+        ///
+        /// When an entity is created new permissions may be assigned to it based on it's parent, if that is the
         /// case then we need to clear all user permissions cache.
         /// </remarks>
         static void ContentServiceSaved(IContentService sender, SaveEventArgs<IContent> e)
@@ -303,8 +305,8 @@ namespace Umbraco.Web.Cache
                     var permissionsChanged = ((Content)x).WasPropertyDirty("PermissionsChanged");
                     if (permissionsChanged)
                     {
-                        clearUserPermissions = true;                        
-                    }    
+                        clearUserPermissions = true;
+                    }
                 }
             });
 
@@ -337,7 +339,7 @@ namespace Umbraco.Web.Cache
         static void ApplicationTreeDeleted(ApplicationTree sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationTreeCache();
-        } 
+        }
         #endregion
 
         #region Application event handlers
@@ -349,7 +351,7 @@ namespace Umbraco.Web.Cache
         static void ApplicationDeleted(Section sender, EventArgs e)
         {
             DistributedCache.Instance.RefreshAllApplicationCache();
-        } 
+        }
         #endregion
 
         #region UserType event handlers
@@ -362,9 +364,9 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshUserTypeCache(x.Id));
         }
-        
+
         #endregion
-        
+
         #region Dictionary event handlers
 
         static void LocalizationServiceSavedDictionaryItem(ILocalizationService sender, SaveEventArgs<IDictionaryItem> e)
@@ -390,11 +392,11 @@ namespace Umbraco.Web.Cache
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveDataTypeCache(x));
         }
 
-   
+
         #endregion
 
         #region Stylesheet and stylesheet property event handlers
-     
+
         static void FileServiceDeletedStylesheet(IFileService sender, DeleteEventArgs<Stylesheet> e)
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveStylesheetCache(x));
@@ -441,7 +443,7 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshLanguageCache(x));
         }
-      
+
         #endregion
 
         #region Content/media/member Type event handlers
@@ -505,9 +507,9 @@ namespace Umbraco.Web.Cache
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshMemberTypeCache(x));
         }
 
-        
+
         #endregion
-        
+
         #region User/permissions event handlers
 
         static void CacheRefresherEventHandler_AssignedPermissions(PermissionRepository<IContent> sender, SaveEventArgs<EntityPermission> e)
@@ -540,7 +542,7 @@ namespace Umbraco.Web.Cache
         {
             e.DeletedEntities.ForEach(x => DistributedCache.Instance.RemoveUserCache(x.Id));
         }
-        
+
         private static void InvalidateCacheForPermissionsChange(UserPermission sender)
         {
             if (sender.User != null)
@@ -580,7 +582,7 @@ namespace Umbraco.Web.Cache
         {
             e.SavedEntities.ForEach(x => DistributedCache.Instance.RefreshTemplateCache(x.Id));
         }
-      
+
         #endregion
 
         #region Macro event handlers
@@ -600,7 +602,7 @@ namespace Umbraco.Web.Cache
                 DistributedCache.Instance.RefreshMacroCache(entity);
             }
         }
-  
+
         #endregion
 
         #region Media event handlers
@@ -631,14 +633,14 @@ namespace Umbraco.Web.Cache
         static void MediaServiceSaved(IMediaService sender, SaveEventArgs<IMedia> e)
         {
             DistributedCache.Instance.RefreshMediaCache(e.SavedEntities.ToArray());
-        } 
+        }
         #endregion
 
         #region Member event handlers
 
         static void MemberServiceDeleted(IMemberService sender, DeleteEventArgs<IMember> e)
         {
-            DistributedCache.Instance.RemoveMemberCache(e.DeletedEntities.ToArray());    
+            DistributedCache.Instance.RemoveMemberCache(e.DeletedEntities.ToArray());
         }
 
         static void MemberServiceSaved(IMemberService sender, SaveEventArgs<IMember> e)

From 22397ded9ba91bdf7ae11ccae6eb7f61608f7b8b Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 2 Dec 2016 11:53:37 +0100
Subject: [PATCH 40/52] Be more tolerant with Xml cache document

---
 .../XmlPublishedCache/PublishedContentCache.cs           | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
index 00782f097e..e58bc73b25 100644
--- a/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
+++ b/src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedContentCache.cs
@@ -179,7 +179,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
                 elt = null;
                 var min = int.MaxValue;
-                foreach (XmlElement e in xml.DocumentElement.ChildNodes)
+                foreach (var e in xml.DocumentElement.ChildNodes.OfType<XmlElement>())
                 {
                     var sortOrder = int.Parse(e.GetAttribute("sortOrder"));
                     if (sortOrder < min)
@@ -201,7 +201,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
 
             if (hideTopLevelNode && startNodeId <= 0)
             {
-                foreach (XmlElement e in elt.ChildNodes)
+                foreach (var e in elt.ChildNodes.OfType<XmlElement>())
                 {
                     var id = NavigateElementRoute(e, urlParts);
                     if (id > 0) return id;
@@ -224,11 +224,8 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
             while (found && i < urlParts.Length)
             {
                 found = false;
-                foreach (XmlNode childNode in elt.ChildNodes)
+                foreach (var child in elt.ChildNodes.OfType<XmlElement>())
                 {
-                    var child = childNode as XmlElement;
-                    if (child == null) continue; // be safe
-
                     var noNode = UseLegacySchema
                         ? child.Name != "node"
                         : child.GetAttributeNode("isDoc") == null;

From b0aae7248c92b26fcdf8808ab940be436f8562af Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 2 Dec 2016 17:04:51 +0100
Subject: [PATCH 41/52] Import DatabaseDebugHelper (disabled)

---
 .../Persistence/DatabaseDebugHelper.cs        | 169 ++++++++++++++++++
 .../Persistence/UmbracoDatabase.cs            |  28 ++-
 src/Umbraco.Core/Umbraco.Core.csproj          |   1 +
 3 files changed, 192 insertions(+), 6 deletions(-)
 create mode 100644 src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs

diff --git a/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs b/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
new file mode 100644
index 0000000000..06512c2d68
--- /dev/null
+++ b/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
@@ -0,0 +1,169 @@
+#if DEBUG_DATABASES
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Data.Common;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+namespace Umbraco.Core.Persistence
+{
+    internal static class DatabaseDebugHelper
+    {
+        private const int CommandsSize = 100;
+        private static readonly Queue<Tuple<string, WeakReference<IDbCommand>>> Commands = new Queue<Tuple<string, WeakReference<IDbCommand>>>();
+
+        public static void SetCommand(IDbCommand command, string context)
+        {
+            var prof = command as StackExchange.Profiling.Data.ProfiledDbCommand;
+            if (prof != null) command = prof.InternalCommand;
+            lock (Commands)
+            {
+                Commands.Enqueue(Tuple.Create(context, new WeakReference<IDbCommand>(command)));
+                while (Commands.Count > CommandsSize) Commands.Dequeue();
+            }
+        }
+
+        public static string GetCommandContext(IDbCommand command)
+        {
+            lock (Commands)
+            {
+                var tuple = Commands.FirstOrDefault(x =>
+                {
+                    IDbCommand c;
+                    return x.Item2.TryGetTarget(out c) && c == command;
+                });
+                return tuple == null ? "?" : tuple.Item1;
+            }
+        }
+
+        public static string GetReferencedObjects(IDbConnection con)
+        {
+            var prof = con as StackExchange.Profiling.Data.ProfiledDbConnection;
+            if (prof != null) con = prof.InnerConnection;
+            var dbCon = con as DbConnection;
+            return dbCon == null
+                ? "NotSupported: " + con.GetType()
+                : GetReferencedObjects(dbCon);
+        }
+
+        public static string GetReferencedObjects(DbConnection con)
+        {
+            var t = con.GetType();
+
+            var field = t.GetField("_innerConnection", BindingFlags.Instance | BindingFlags.NonPublic);
+            if (field == null) throw new Exception("panic: _innerConnection (" + t + ").");
+            var innerConnection = field.GetValue(con);
+
+            var tin = innerConnection.GetType();
+
+            var fi = con is System.Data.SqlClient.SqlConnection
+                ? tin.BaseType.BaseType.GetField("_referenceCollection", BindingFlags.Instance | BindingFlags.NonPublic)
+                : tin.BaseType.GetField("_referenceCollection", BindingFlags.Instance | BindingFlags.NonPublic);
+            if (fi == null)
+                //return "";
+                throw new Exception("panic: referenceCollection.");
+
+            var rc = fi.GetValue(innerConnection);
+            if (rc == null)
+                //return "";
+                throw new Exception("panic: innerCollection.");
+
+            field = rc.GetType().BaseType.GetField("_items", BindingFlags.Instance | BindingFlags.NonPublic);
+            if (field == null) throw new Exception("panic: items.");
+            var items = field.GetValue(rc);
+            var prop = items.GetType().GetProperty("Length", BindingFlags.Instance | BindingFlags.Public);
+            if (prop == null) throw new Exception("panic: Length.");
+            var count = Convert.ToInt32(prop.GetValue(items, null));
+            var miGetValue = items.GetType().GetMethod("GetValue", new[] { typeof(int) });
+            if (miGetValue == null) throw new Exception("panic: GetValue.");
+
+            if (count == 0) return null;
+
+            StringBuilder result = null;
+            var hasb = false;
+
+            for (var i = 0; i < count; i++)
+            {
+                var referencedObj = miGetValue.Invoke(items, new object[] { i });
+
+                var hasTargetProp = referencedObj.GetType().GetProperty("HasTarget");
+                if (hasTargetProp == null) throw new Exception("panic: HasTarget");
+                var hasTarget = Convert.ToBoolean(hasTargetProp.GetValue(referencedObj, null));
+                if (hasTarget == false) continue;
+
+                if (hasb == false)
+                {
+                    result = new StringBuilder();
+                    result.AppendLine("ReferencedItems");
+                    hasb = true;
+                }
+
+                //var inUseProp = referencedObj.GetType().GetProperty("InUse");
+                //if (inUseProp == null) throw new Exception("panic: InUse.");
+                //var inUse = Convert.ToBoolean(inUseProp.GetValue(referencedObj, null));
+                var inUse = "?";
+
+                var targetProp = referencedObj.GetType().GetProperty("Target");
+                if (targetProp == null) throw new Exception("panic: Target.");
+                var objTarget = targetProp.GetValue(referencedObj, null);
+
+                result.AppendFormat("\tDiff.Item id=\"{0}\" inUse=\"{1}\" type=\"{2}\" hashCode=\"{3}\"" + Environment.NewLine,
+                    i, inUse, objTarget.GetType(), objTarget.GetHashCode());
+
+                DbCommand cmd = null;
+                if (objTarget is DbDataReader)
+                {
+                    //var rdr = objTarget as DbDataReader;
+                    try
+                    {
+                        cmd = objTarget.GetType().GetProperty("Command", BindingFlags.Instance | BindingFlags.NonPublic).GetValue(objTarget, null) as DbCommand;
+                    }
+                    catch (Exception e)
+                    {
+                        result.AppendFormat("\t\tObjTarget: DbDataReader, Exception: {0}" + Environment.NewLine, e);
+                    }
+                }
+                else if (objTarget is DbCommand)
+                {
+                    cmd = objTarget as DbCommand;
+                }
+                if (cmd == null)
+                {
+                    result.AppendFormat("\t\tObjTarget: {0}" + Environment.NewLine, objTarget.GetType());
+                    continue;
+                }
+
+                result.AppendFormat("\t\tCommand type=\"{0}\" hashCode=\"{1}\"" + Environment.NewLine,
+                    cmd.GetType(), cmd.GetHashCode());
+
+                var context = GetCommandContext(cmd);
+                result.AppendFormat("\t\t\tContext: {0}" + Environment.NewLine, context);
+
+                var properties = cmd.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
+                foreach (var pi in properties)
+                {
+                    if (pi.PropertyType.IsPrimitive || pi.PropertyType == typeof(string))
+                        result.AppendFormat("\t\t\t{0}: {1}" + Environment.NewLine, pi.Name, pi.GetValue(cmd, null));
+
+                    if (pi.PropertyType != typeof (DbConnection) || pi.Name != "Connection") continue;
+
+                    var con1 = pi.GetValue(cmd, null) as DbConnection;
+                    result.AppendFormat("\t\t\tConnection type=\"{0}\" state=\"{1}\" hashCode=\"{2}\"" + Environment.NewLine,
+                        con1.GetType(), con1.State, con1.GetHashCode());
+
+                    var propertiesCon = con1.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public);
+                    foreach (var picon in propertiesCon)
+                    {
+                        if (picon.PropertyType.IsPrimitive || picon.PropertyType == typeof(string))
+                            result.AppendFormat("\t\t\t\t{0}: {1}" + Environment.NewLine, picon.Name, picon.GetValue(con1, null));
+                    }
+                }
+            }
+
+            return result == null ? null : result.ToString();
+        }
+    }
+}
+#endif
diff --git a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
index 4c7ba0b4c6..0b370c9978 100644
--- a/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
+++ b/src/Umbraco.Core/Persistence/UmbracoDatabase.cs
@@ -1,13 +1,15 @@
 using System;
 using System.Data;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Text;
-using MySql.Data.MySqlClient;
 using StackExchange.Profiling;
 using Umbraco.Core.Logging;
 using Umbraco.Core.Persistence.SqlSyntax;
 
+#if DEBUG_DATABASES
+using System.Threading;
+#endif
+
 namespace Umbraco.Core.Persistence
 {
     /// <summary>
@@ -55,6 +57,12 @@ namespace Umbraco.Core.Persistence
         /// </summary>
         internal bool EnableSqlTrace { get; set; }
 
+#if DEBUG_DATABASES
+        private const bool EnableSqlTraceDefault = true;
+#else
+        private const bool EnableSqlTraceDefault = false;
+#endif
+
         /// <summary>
         /// Used for testing
         /// </summary>
@@ -105,28 +113,28 @@ namespace Umbraco.Core.Persistence
             : base(connection)
         {
             _logger = logger;
-            EnableSqlTrace = false;
+            EnableSqlTrace = EnableSqlTraceDefault;
         }
 
         public UmbracoDatabase(string connectionString, string providerName, ILogger logger)
             : base(connectionString, providerName)
         {
             _logger = logger;
-            EnableSqlTrace = false;
+            EnableSqlTrace = EnableSqlTraceDefault;
         }
 
         public UmbracoDatabase(string connectionString, DbProviderFactory provider, ILogger logger)
             : base(connectionString, provider)
         {
             _logger = logger;
-            EnableSqlTrace = false;
+            EnableSqlTrace = EnableSqlTraceDefault;
         }
 
         public UmbracoDatabase(string connectionStringName, ILogger logger)
             : base(connectionStringName)
         {
             _logger = logger;
-            EnableSqlTrace = false;
+            EnableSqlTrace = EnableSqlTraceDefault;
         }
 
         public override IDbConnection OnConnectionOpened(IDbConnection connection)
@@ -197,6 +205,12 @@ namespace Umbraco.Core.Persistence
                 _logger.Debug<UmbracoDatabase>(sb.ToString().Replace("{", "{{").Replace("}", "}}"));
             }
 
+#if DEBUG_DATABASES
+            DatabaseDebugHelper.SetCommand(cmd, InstanceSid + " [T" + Thread.CurrentThread.ManagedThreadId + "]");
+            var refsobj = DatabaseDebugHelper.GetReferencedObjects(cmd.Connection);
+            if (refsobj != null) _logger.Debug<UmbracoDatabase>("Oops!" + Environment.NewLine + refsobj);
+#endif
+
             base.OnExecutingCommand(cmd);
         }
 
@@ -248,7 +262,9 @@ namespace Umbraco.Core.Persistence
         protected override void Dispose(bool disposing)
         {
             base.Dispose(disposing);
+#if DEBUG_DATABASES
             LogHelper.Debug<UmbracoDatabase>("Dispose (" + InstanceSid + ").");
+#endif
             if (DatabaseFactory != null) DatabaseFactory.OnDispose(this);
         }
     }
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e4df147807..11f113ab1e 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -429,6 +429,7 @@
     <Compile Include="Persistence\BulkDataReader.cs" />
     <Compile Include="Persistence\Constants-Locks.cs" />
     <Compile Include="Persistence\DatabaseNodeLockExtensions.cs" />
+    <Compile Include="Persistence\DatabaseDebugHelper.cs" />
     <Compile Include="Persistence\Factories\ExternalLoginFactory.cs" />
     <Compile Include="Persistence\Factories\MigrationEntryFactory.cs" />
     <Compile Include="Persistence\Factories\PublicAccessEntryFactory.cs" />

From f79e63a13b0048408773fa479e6b741650d18566 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Fri, 2 Dec 2016 17:45:15 +0100
Subject: [PATCH 42/52] Fix background-thread-safe database usage

---
 src/Umbraco.Core/DatabaseContext.cs           |  5 +-
 src/Umbraco.Web/Scheduling/LogScrubber.cs     |  2 +-
 .../Scheduling/ScheduledPublishing.cs         |  2 +-
 .../ServerRegistrationEventHandler.cs         |  2 +-
 src/UmbracoExamine/BaseUmbracoIndexer.cs      | 57 ++++++++++++-------
 .../DataServices/UmbracoContentService.cs     |  6 +-
 6 files changed, 45 insertions(+), 29 deletions(-)

diff --git a/src/Umbraco.Core/DatabaseContext.cs b/src/Umbraco.Core/DatabaseContext.cs
index 27013d8ecd..1c8b3dabee 100644
--- a/src/Umbraco.Core/DatabaseContext.cs
+++ b/src/Umbraco.Core/DatabaseContext.cs
@@ -121,12 +121,9 @@ namespace Umbraco.Core
         {
             var factory = _factory as DefaultDatabaseFactory;
             if (factory == null) throw new NotSupportedException();
+
             if (DefaultDatabaseFactory.HasAmbientDatabase)
             {
-                // has ambient,
-                // if forcing, detach it and replace it with a new, temp, database
-                //  when the UsingDatabase is disposed, the temp database is disposed and the original one is re-instated
-                // else do nothing (and nothing will be disposed)
                 return force
                     ? new UsingDatabase(DefaultDatabaseFactory.DetachAmbientDatabase(), factory.CreateDatabase())
                     : new UsingDatabase(null, null);
diff --git a/src/Umbraco.Web/Scheduling/LogScrubber.cs b/src/Umbraco.Web/Scheduling/LogScrubber.cs
index 7737101961..794c927f97 100644
--- a/src/Umbraco.Web/Scheduling/LogScrubber.cs
+++ b/src/Umbraco.Web/Scheduling/LogScrubber.cs
@@ -78,7 +78,7 @@ namespace Umbraco.Web.Scheduling
             }
 
             // running on a background task, requires a safe database (see UsingSafeDatabase doc)
-            using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
+            using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase())
             using (DisposableTimer.DebugDuration<LogScrubber>("Log scrubbing executing", "Log scrubbing complete"))
             {
                 Log.CleanLogs(GetLogScrubbingMaximumAge(_settings));
diff --git a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
index ba4fdddba5..5288f2630a 100644
--- a/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
+++ b/src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
@@ -84,7 +84,7 @@ namespace Umbraco.Web.Scheduling
 
                         // running on a background task, requires a safe database (see UsingSafeDatabase doc)
                         // (GetAuthenticationHeaderValue uses UserService to load the current user, hence requires a database)
-                        using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
+                        using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase())
                         {
                             //pass custom the authorization header
                             request.Headers.Authorization = AdminTokenAuthorizeAttribute.GetAuthenticationHeaderValue(_appContext);
diff --git a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
index 15ab8f244b..93d3aa2f87 100644
--- a/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
+++ b/src/Umbraco.Web/Strategies/ServerRegistrationEventHandler.cs
@@ -138,7 +138,7 @@ namespace Umbraco.Web.Strategies
                 try
                 {
                     // running on a background task, requires a safe database (see UsingSafeDatabase doc)
-                    using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase(true))
+                    using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase())
                     {
                         _svc.TouchServer(_serverAddress, _svc.CurrentServerIdentity, _registrar.Options.StaleServerTimeout);
                     }
diff --git a/src/UmbracoExamine/BaseUmbracoIndexer.cs b/src/UmbracoExamine/BaseUmbracoIndexer.cs
index 26763bd7cd..88be199c88 100644
--- a/src/UmbracoExamine/BaseUmbracoIndexer.cs
+++ b/src/UmbracoExamine/BaseUmbracoIndexer.cs
@@ -32,6 +32,12 @@ namespace UmbracoExamine
     /// </summary>
     public abstract class BaseUmbracoIndexer : LuceneIndexer
     {
+        // note
+        // wrapping all operations that end up calling base.SafelyProcessQueueItems in a safe call
+        // context because they will fork a thread/task/whatever which should *not* capture our
+        // call context (and the database it can contain)! ideally we should be able to override
+        // SafelyProcessQueueItems but that's not possible in the current version of Examine.
+
         #region Constructors
 
         /// <summary>
@@ -263,7 +269,10 @@ namespace UmbracoExamine
         {
             if (CanInitialize())
             {
-                base.RebuildIndex();
+                using (new SafeCallContext())
+                {
+                    base.RebuildIndex();
+                }
             }
         }
 
@@ -277,7 +286,10 @@ namespace UmbracoExamine
         {
             if (CanInitialize())
             {
-                base.IndexAll(type);
+                using (new SafeCallContext())
+                {
+                    base.IndexAll(type);
+                }
             }
         }
 
@@ -288,7 +300,10 @@ namespace UmbracoExamine
                 if (!SupportedTypes.Contains(type))
                     return;
 
-                base.ReIndexNode(node, type);
+                using (new SafeCallContext())
+                {
+                    base.ReIndexNode(node, type);
+                }
             }
         }
 
@@ -302,7 +317,10 @@ namespace UmbracoExamine
         {
             if (CanInitialize())
             {
-                base.DeleteFromIndex(nodeId);
+                using (new SafeCallContext())
+                {
+                    base.DeleteFromIndex(nodeId);
+                }
             }            
         }
 
@@ -444,31 +462,32 @@ namespace UmbracoExamine
         }
         #endregion
 
-        
         [Obsolete("This method is not be used, it will be removed in future versions")]
         [EditorBrowsable(EditorBrowsableState.Never)]
         private void AddNodesToIndex(string xPath, string type)
         {
-            // Get all the nodes of nodeTypeAlias == nodeTypeAlias
-            XDocument xDoc = GetXDocument(xPath, type);
-            if (xDoc != null)
+            using (new SafeCallContext())
             {
-                var rootNode = xDoc.Root;
-                if (rootNode != null)
+                // Get all the nodes of nodeTypeAlias == nodeTypeAlias
+                XDocument xDoc = GetXDocument(xPath, type);
+                if (xDoc != null)
                 {
-                    //the result will either be a single doc with an id as the root, or it will
-                    // be multiple docs with a <nodes> wrapper, we need to check for this
-                    if (rootNode.HasAttributes)
+                    var rootNode = xDoc.Root;
+                    if (rootNode != null)
                     {
-                        AddNodesToIndex(new[] {rootNode}, type);
-                    }
-                    else
-                    {
-                        AddNodesToIndex(rootNode.Elements(), type);
+                        //the result will either be a single doc with an id as the root, or it will
+                        // be multiple docs with a <nodes> wrapper, we need to check for this
+                        if (rootNode.HasAttributes)
+                        {
+                            AddNodesToIndex(new[] { rootNode }, type);
+                        }
+                        else
+                        {
+                            AddNodesToIndex(rootNode.Elements(), type);
+                        }
                     }
                 }
             }
-
         }
     }
 }
diff --git a/src/UmbracoExamine/DataServices/UmbracoContentService.cs b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
index df0562f49c..4d265bf127 100644
--- a/src/UmbracoExamine/DataServices/UmbracoContentService.cs
+++ b/src/UmbracoExamine/DataServices/UmbracoContentService.cs
@@ -57,7 +57,7 @@ namespace UmbracoExamine.DataServices
         [Obsolete("This should no longer be used, latest content will be indexed by using the IContentService directly")]
 		public XDocument GetLatestContentByXPath(string xpath)
         {
-            using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
+            using (_applicationContext.DatabaseContext.UseSafeDatabase())
             {
                 var xmlContent = XDocument.Parse("<content></content>");
                 var rootContent = _applicationContext.Services.ContentService.GetRootContent();
@@ -79,7 +79,7 @@ namespace UmbracoExamine.DataServices
         /// <returns></returns>
         public bool IsProtected(int nodeId, string path)
         {
-            using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
+            using (_applicationContext.DatabaseContext.UseSafeDatabase())
             {
                 return _applicationContext.Services.PublicAccessService.IsProtected(path.EnsureEndsWith("," + nodeId));
             }
@@ -92,7 +92,7 @@ namespace UmbracoExamine.DataServices
 		
 		public IEnumerable<string> GetAllUserPropertyNames()
 	    {
-	        using (_applicationContext.DatabaseContext.UseSafeDatabase()) // reuse current db if any else use & dispose one
+	        using (_applicationContext.DatabaseContext.UseSafeDatabase())
             {
 	            try
 	            {

From 90f30c3f3c1194a2efdd7f5e4e5ea688c67d5e81 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 5 Dec 2016 17:13:07 +1100
Subject: [PATCH 43/52] Ensures tag values are Html encoded both on the client
 side and on the server side to prevent any xss

---
 .../lib/umbraco/Extensions.js                    | 16 ++++++++++++++++
 .../propertyeditors/tags/tags.controller.js      |  2 +-
 .../PropertyEditors/TagsPropertyEditor.cs        |  5 ++++-
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js b/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
index b70a6b12bc..3c148f0535 100644
--- a/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
+++ b/src/Umbraco.Web.UI.Client/lib/umbraco/Extensions.js
@@ -69,6 +69,22 @@
         };
     }
 
+    if (!String.prototype.htmlEncode) {
+        /** htmlEncode extension method for string */
+        String.prototype.htmlEncode = function () {
+            //create a in-memory div, set it's inner text(which jQuery automatically encodes)
+            //then grab the encoded contents back out.  The div never exists on the page.
+            return $('<div/>').text(this).html();
+        };
+    }
+
+    if (!String.prototype.htmlDecode) {
+        /** htmlDecode extension method for string */
+        String.prototype.htmlDecode = function () {
+            return $('<div/>').html(this).text();
+        };
+    }
+
     if (!String.prototype.startsWith) {
         /** startsWith extension method for string */
         String.prototype.startsWith = function (str) {            
diff --git a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
index d18ff73bd5..f965b812d8 100644
--- a/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
+++ b/src/Umbraco.Web.UI.Client/src/views/propertyeditors/tags/tags.controller.js
@@ -41,7 +41,7 @@ angular.module("umbraco")
 
             //Helper method to add a tag on enter or on typeahead select
             function addTag(tagToAdd) {
-                tagToAdd = $sanitize(tagToAdd);
+                tagToAdd = String(tagToAdd).htmlEncode();
                 if (tagToAdd != null && tagToAdd.length > 0) {
                     if ($scope.model.value.indexOf(tagToAdd) < 0) {
                         $scope.model.value.push(tagToAdd);
diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index b44c65b157..120b2d678d 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Net;
 using System.Runtime.InteropServices;
 using Newtonsoft.Json.Linq;
 using Umbraco.Core;
@@ -60,7 +61,9 @@ namespace Umbraco.Web.PropertyEditors
             public override object ConvertEditorToDb(ContentPropertyData editorValue, object currentValue)
             {
                 var json = editorValue.Value as JArray;
-                return json == null ? null : json.Select(x => x.Value<string>());
+                return json == null 
+                    ? null 
+                    : json.Select(x => x.Value<string>()).Where(x => x.IsNullOrWhiteSpace() == false).Select(WebUtility.HtmlEncode);
             }
 
             /// <summary>

From 4823235bf58f00a49e18c9974b6d60c8cae427e6 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Mon, 5 Dec 2016 17:21:24 +1100
Subject: [PATCH 44/52] Ensures the cleaned value isn't double html encoded

---
 src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
index 120b2d678d..be228bf3ef 100644
--- a/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
+++ b/src/Umbraco.Web/PropertyEditors/TagsPropertyEditor.cs
@@ -63,7 +63,12 @@ namespace Umbraco.Web.PropertyEditors
                 var json = editorValue.Value as JArray;
                 return json == null 
                     ? null 
-                    : json.Select(x => x.Value<string>()).Where(x => x.IsNullOrWhiteSpace() == false).Select(WebUtility.HtmlEncode);
+                    : json.Select(x => x.Value<string>()).Where(x => x.IsNullOrWhiteSpace() == false)
+                        //First we will decode it as html because we know that if this is not a malicious post that the value is
+                        // already Html encoded by the tags JavaScript controller. Then we'll re-Html Encode it to ensure that in case this
+                        // is a malicious post (i.e. someone is submitting data manually by modifying the request).
+                        .Select(WebUtility.HtmlDecode)
+                        .Select(WebUtility.HtmlEncode);
             }
 
             /// <summary>

From f51a086137fc34a619ed45ac19ea220f01a5626e Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Wed, 30 Nov 2016 18:18:41 +0100
Subject: [PATCH 45/52] deploy-11 - implement DeployVersionAttribute

---
 .../Deploy/DeploySupportAttribute.cs             | 16 ++++++++++++++++
 src/Umbraco.Core/Properties/AssemblyInfo.cs      |  9 ++++++---
 src/Umbraco.Core/Umbraco.Core.csproj             |  1 +
 3 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 src/Umbraco.Core/Deploy/DeploySupportAttribute.cs

diff --git a/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs b/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs
new file mode 100644
index 0000000000..f7f32b52d5
--- /dev/null
+++ b/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs
@@ -0,0 +1,16 @@
+using System;
+using Semver;
+
+namespace Umbraco.Core.Deploy
+{
+    [AttributeUsage(AttributeTargets.Assembly)]
+    public class DeploySupportAttribute : Attribute
+    {
+        public DeploySupportAttribute(string version)
+        {
+            Version = version;
+        }
+
+        public SemVersion Version { get; private set; }
+    }
+}
diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index dbc1ab6c93..204612b3d9 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -3,8 +3,9 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
+using Umbraco.Core.Deploy;
 
-// General Information about an assembly is controlled through the following 
+// General Information about an assembly is controlled through the following
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Umbraco.Core")]
@@ -12,14 +13,16 @@ using System.Security.Permissions;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Umbraco CMS")]
 
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("130a6b5c-50e7-4df3-a0dd-e9e7eb0b7c5c")]
 
+[assembly: DeploySupport("1.0.0-alpha000")]
+
 [assembly: InternalsVisibleTo("umbraco")]
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Extensions")]
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 11f113ab1e..9d27e79e21 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -313,6 +313,7 @@
     <Compile Include="DateTimeExtensions.cs" />
     <Compile Include="DecimalExtensions.cs" />
     <Compile Include="DelegateExtensions.cs" />
+    <Compile Include="Deploy\DeploySupportAttribute.cs" />
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />

From 6c4185dc0157611a0130a0a1c4cf923e53bb2bd8 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 5 Dec 2016 12:13:11 +0100
Subject: [PATCH 46/52] Version 7.6.0-alpha032

---
 src/SolutionInfo.cs                              | 2 +-
 src/Umbraco.Core/Configuration/UmbracoVersion.cs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/SolutionInfo.cs b/src/SolutionInfo.cs
index 80382c52aa..f6a14611df 100644
--- a/src/SolutionInfo.cs
+++ b/src/SolutionInfo.cs
@@ -12,4 +12,4 @@ using System.Resources;
 [assembly: AssemblyVersion("1.0.*")]
 
 [assembly: AssemblyFileVersion("7.6.0")]
-[assembly: AssemblyInformationalVersion("7.6.0-alpha031")]
\ No newline at end of file
+[assembly: AssemblyInformationalVersion("7.6.0-alpha032")]
\ No newline at end of file
diff --git a/src/Umbraco.Core/Configuration/UmbracoVersion.cs b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
index d534ba314a..9d2bf7ddae 100644
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
         /// Gets the version comment (like beta or RC).
         /// </summary>
         /// <value>The version comment.</value>
-        public static string CurrentComment { get { return "alpha031"; } }
+        public static string CurrentComment { get { return "alpha032"; } }
 
         // Get the version of the umbraco.dll by looking at a class in that dll
         // Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx

From b4ef37a61aca4b2d5371bf889a61d8e2c1755389 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Mon, 5 Dec 2016 16:39:20 +0100
Subject: [PATCH 47/52] More database fixing

---
 src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs | 7 +++++--
 src/UmbracoExamine/BaseUmbracoIndexer.cs               | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
index 140540ed4c..fc981b0280 100644
--- a/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
+++ b/src/Umbraco.Core/Persistence/DefaultDatabaseFactory.cs
@@ -300,9 +300,12 @@ namespace Umbraco.Core.Persistence
             var database = o as UmbracoDatabase;
             if (o != null && database == null) throw new ArgumentException("Not an UmbracoDatabase.", "o");
 
+            var ambient = DetachAmbientDatabase();
+            if (ambient != null) ambient.Dispose();
+
             if (HttpContext.Current == null)
             {
-                if (NonContextValue != null) throw new InvalidOperationException();
+                //if (NonContextValue != null) throw new InvalidOperationException();
                 if (database == null) return;
 
                 NonContextValue = database;
@@ -310,7 +313,7 @@ namespace Umbraco.Core.Persistence
             }
             else
             {
-                if (HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
+                //if (HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] != null) throw new InvalidOperationException();
                 if (database == null) return;
 
                 HttpContext.Current.Items[typeof (DefaultDatabaseFactory)] = database;
diff --git a/src/UmbracoExamine/BaseUmbracoIndexer.cs b/src/UmbracoExamine/BaseUmbracoIndexer.cs
index 88be199c88..ebd0db8b1c 100644
--- a/src/UmbracoExamine/BaseUmbracoIndexer.cs
+++ b/src/UmbracoExamine/BaseUmbracoIndexer.cs
@@ -269,10 +269,12 @@ namespace UmbracoExamine
         {
             if (CanInitialize())
             {
+                // remove the db from lcc
                 using (new SafeCallContext())
+                //using (ApplicationContext.Current.DatabaseContext.UseSafeDatabase())
                 {
                     base.RebuildIndex();
-                }
+                } // will try to re-instate the original DB *but* if a DB has been created in the meantime what shall we do?
             }
         }
 

From ba27c7e8e8cf92eb3f2524719ee2dbff47d9ecad Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 6 Dec 2016 15:46:17 +0100
Subject: [PATCH 48/52] U4-9249 - fix member type standard properties

---
 .../Persistence/Factories/MemberTypeReadOnlyFactory.cs |  9 ++++++++-
 .../Persistence/Repositories/MemberTypeRepository.cs   | 10 ++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
index b4d5d2e566..ba7a47165b 100644
--- a/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
+++ b/src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
@@ -9,9 +9,10 @@ namespace Umbraco.Core.Persistence.Factories
 {
     internal class MemberTypeReadOnlyFactory 
     {
-        public IMemberType BuildEntity(MemberTypeReadOnlyDto dto)
+        public IMemberType BuildEntity(MemberTypeReadOnlyDto dto, out bool needsSaving)
         {
             var standardPropertyTypes = Constants.Conventions.Member.GetStandardPropertyTypeStubs();
+            needsSaving = false;
 
             var memberType = new MemberType(dto.ParentId);
 
@@ -47,6 +48,12 @@ namespace Umbraco.Core.Persistence.Factories
                 {
                     if (dto.PropertyTypes.Any(x => x.Alias.Equals(standardPropertyType.Key))) continue;
 
+                    // beware!
+                    // means that we can return a memberType "from database" that has some property types
+                    // that do *not* come from the database and therefore are incomplete eg have no key,
+                    // no id, no dataTypeDefinitionId - ouch! - better notify caller of the situation
+                    needsSaving = true;
+
                     //Add the standard PropertyType to the current list
                     propertyTypes.Add(standardPropertyType.Value);
 
diff --git a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
index d06399a85b..7d5defe8c9 100644
--- a/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
@@ -300,13 +300,19 @@ namespace Umbraco.Core.Persistence.Repositories
         /// </summary>
         /// <param name="dtos"></param>
         /// <returns></returns>
-        private static IEnumerable<IMemberType> BuildFromDtos(List<MemberTypeReadOnlyDto> dtos)
+        private IEnumerable<IMemberType> BuildFromDtos(List<MemberTypeReadOnlyDto> dtos)
         {
             if (dtos == null || dtos.Any() == false)
                 return Enumerable.Empty<IMemberType>();
 
             var factory = new MemberTypeReadOnlyFactory();
-            return dtos.Select(factory.BuildEntity);
+            return dtos.Select(x =>
+            {
+                bool needsSaving;
+                var memberType = factory.BuildEntity(x, out needsSaving);
+                if (needsSaving) PersistUpdatedItem(memberType);
+                return memberType;
+            }).ToList();
         }
 
         /// <summary>

From 960040e51e707f3676acffbe60e99d04f2edcf70 Mon Sep 17 00:00:00 2001
From: Claus <claus@umbraco.com>
Date: Wed, 7 Dec 2016 12:57:29 +0100
Subject: [PATCH 49/52] U4-9255 Not having access to settings section causes
 backoffice user to be logged out when browsing media list views

---
 src/Umbraco.Web/Editors/MediaTypeController.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Umbraco.Web/Editors/MediaTypeController.cs b/src/Umbraco.Web/Editors/MediaTypeController.cs
index a423e638b9..0f83ad6d03 100644
--- a/src/Umbraco.Web/Editors/MediaTypeController.cs
+++ b/src/Umbraco.Web/Editors/MediaTypeController.cs
@@ -49,6 +49,7 @@ namespace Umbraco.Web.Editors
             return Services.ContentTypeService.CountContentTypes();
         }
 
+        [UmbracoTreeAuthorize(Constants.Trees.MediaTypes, Constants.Trees.Media)]
         public MediaTypeDisplay GetById(int id)
         {
             var ct = Services.ContentTypeService.GetMediaType(id);

From b413b7b5af3aa181dca2298c8cbb9b6d0a18af86 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 8 Dec 2016 12:48:44 +1100
Subject: [PATCH 50/52] Lazily creates the static queries instead of eagerly,
 this fixes an issue of if these services are accessed before Umbraco has
 booted

---
 .../Persistence/Repositories/ContentRepository.cs         | 8 +-------
 src/Umbraco.Core/Services/ContentService.cs               | 8 +++++++-
 src/Umbraco.Core/Services/EntityService.cs                | 8 +++++++-
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
index d0c226ace2..e9a4652512 100644
--- a/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
@@ -94,13 +94,7 @@ namespace Umbraco.Core.Persistence.Repositories
             return ProcessQuery(sql);
         }
 
-        #endregion
-
-        #region Static Queries
-
-        private readonly IQuery<IContent> _publishedQuery = Query<IContent>.Builder.Where(x => x.Published == true);
-
-        #endregion
+        #endregion        
 
         #region Overrides of PetaPocoRepositoryBase<IContent>
 
diff --git a/src/Umbraco.Core/Services/ContentService.cs b/src/Umbraco.Core/Services/ContentService.cs
index 6223e5933b..a4c6d354c1 100644
--- a/src/Umbraco.Core/Services/ContentService.cs
+++ b/src/Umbraco.Core/Services/ContentService.cs
@@ -58,7 +58,7 @@ namespace Umbraco.Core.Services
 
         #region Static Queries
 
-        private readonly IQuery<IContent> _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
+        private IQuery<IContent> _notTrashedQuery;
 
         #endregion
 
@@ -793,6 +793,12 @@ namespace Umbraco.Core.Services
         /// <returns></returns>
         internal IEnumerable<IContent> GetAllPublished()
         {
+            //create it once if it is needed (no need for locking here)
+            if (_notTrashedQuery == null)
+            {
+                _notTrashedQuery = Query<IContent>.Builder.Where(x => x.Trashed == false);
+            }
+
             using (var repository = RepositoryFactory.CreateContentRepository(UowProvider.GetUnitOfWork()))
             {
                 return repository.GetByPublishedVersion(_notTrashedQuery);
diff --git a/src/Umbraco.Core/Services/EntityService.cs b/src/Umbraco.Core/Services/EntityService.cs
index a6b84704fc..b56c1fbed2 100644
--- a/src/Umbraco.Core/Services/EntityService.cs
+++ b/src/Umbraco.Core/Services/EntityService.cs
@@ -64,7 +64,7 @@ namespace Umbraco.Core.Services
 
         #region Static Queries
 
-        private readonly IQuery<IUmbracoEntity> _rootEntityQuery = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == -1);
+        private IQuery<IUmbracoEntity> _rootEntityQuery;
 
         #endregion
 
@@ -392,6 +392,12 @@ namespace Umbraco.Core.Services
         /// <returns>An enumerable list of <see cref="IUmbracoEntity"/> objects</returns>
         public virtual IEnumerable<IUmbracoEntity> GetRootEntities(UmbracoObjectTypes umbracoObjectType)
         {
+            //create it once if it is needed (no need for locking here)
+            if (_rootEntityQuery == null)
+            {
+                _rootEntityQuery = Query<IUmbracoEntity>.Builder.Where(x => x.ParentId == -1);
+            }
+
             var objectTypeId = umbracoObjectType.GetGuid();
             using (var repository = RepositoryFactory.CreateEntityRepository(UowProvider.GetUnitOfWork()))
             {

From b9b7c9f96575fff6766b0edc4c01f010609d9fc9 Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 13 Dec 2016 10:35:16 +0100
Subject: [PATCH 51/52] More database fixing (sqlCE)

---
 src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs b/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
index 06512c2d68..4cb8327f5b 100644
--- a/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
+++ b/src/Umbraco.Core/Persistence/DatabaseDebugHelper.cs
@@ -42,6 +42,8 @@ namespace Umbraco.Core.Persistence
         {
             var prof = con as StackExchange.Profiling.Data.ProfiledDbConnection;
             if (prof != null) con = prof.InnerConnection;
+            var ceCon = con as System.Data.SqlServerCe.SqlCeConnection;
+            if (ceCon != null) return null; // "NotSupported: SqlCE";
             var dbCon = con as DbConnection;
             return dbCon == null
                 ? "NotSupported: " + con.GetType()

From 4863052a084a2bda24ab72161c97785683fcd37a Mon Sep 17 00:00:00 2001
From: Stephan <stephane@umbraco.dk>
Date: Tue, 13 Dec 2016 10:58:19 +0100
Subject: [PATCH 52/52] Revert "deploy-11 - implement DeployVersionAttribute"

This reverts commit f51a086137fc34a619ed45ac19ea220f01a5626e.
---
 .../Deploy/DeploySupportAttribute.cs             | 16 ----------------
 src/Umbraco.Core/Properties/AssemblyInfo.cs      |  9 +++------
 src/Umbraco.Core/Umbraco.Core.csproj             |  1 -
 3 files changed, 3 insertions(+), 23 deletions(-)
 delete mode 100644 src/Umbraco.Core/Deploy/DeploySupportAttribute.cs

diff --git a/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs b/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs
deleted file mode 100644
index f7f32b52d5..0000000000
--- a/src/Umbraco.Core/Deploy/DeploySupportAttribute.cs
+++ /dev/null
@@ -1,16 +0,0 @@
-using System;
-using Semver;
-
-namespace Umbraco.Core.Deploy
-{
-    [AttributeUsage(AttributeTargets.Assembly)]
-    public class DeploySupportAttribute : Attribute
-    {
-        public DeploySupportAttribute(string version)
-        {
-            Version = version;
-        }
-
-        public SemVersion Version { get; private set; }
-    }
-}
diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs
index 204612b3d9..dbc1ab6c93 100644
--- a/src/Umbraco.Core/Properties/AssemblyInfo.cs
+++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs
@@ -3,9 +3,8 @@ using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Security;
 using System.Security.Permissions;
-using Umbraco.Core.Deploy;
 
-// General Information about an assembly is controlled through the following
+// General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Umbraco.Core")]
@@ -13,16 +12,14 @@ using Umbraco.Core.Deploy;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyProduct("Umbraco CMS")]
 
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components.  If you need to access a type in this assembly from
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
 // COM, set the ComVisible attribute to true on that type.
 [assembly: ComVisible(false)]
 
 // The following GUID is for the ID of the typelib if this project is exposed to COM
 [assembly: Guid("130a6b5c-50e7-4df3-a0dd-e9e7eb0b7c5c")]
 
-[assembly: DeploySupport("1.0.0-alpha000")]
-
 [assembly: InternalsVisibleTo("umbraco")]
 [assembly: InternalsVisibleTo("Umbraco.Tests")]
 [assembly: InternalsVisibleTo("Umbraco.Extensions")]
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index 9d27e79e21..11f113ab1e 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -313,7 +313,6 @@
     <Compile Include="DateTimeExtensions.cs" />
     <Compile Include="DecimalExtensions.cs" />
     <Compile Include="DelegateExtensions.cs" />
-    <Compile Include="Deploy\DeploySupportAttribute.cs" />
     <Compile Include="DictionaryExtensions.cs" />
     <Compile Include="Dictionary\CultureDictionaryFactoryResolver.cs" />
     <Compile Include="Dictionary\ICultureDictionaryFactory.cs" />