Merge in 'release/7.0' changes

Author: dotnet-bot

src/EFCore.SqlServer/Update/Internal/SqlServerUpdateSqlGenerator.cs

@@ -18,6 +18,9 @@ public class SqlServerUpdateSqlGenerator : UpdateAndSelectSqlGenerator, ISqlServ
     private static readonly bool UseOldBehavior30330
         = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330", out var enabled30330) && enabled30330;
 
+    private static readonly bool LegacyUseOldBehavior30330
+        = AppContext.TryGetSwitch("Microsoft.EntityFrameworkCore.Issue30330 ", out var enabled30330) && enabled30330;
+
     /// <summary>
     ///     This is an internal API that supports the Entity Framework Core infrastructure and not subject to
     ///     the same compatibility standards as public APIs. It may be changed or removed without notice in
@@ -159,7 +162,7 @@ protected override void AppendUpdateColumnValue(
             if (columnModification.Property != null)
             {
                 bool needsTypeConversion;
-                if (!UseOldBehavior30330)
+                if (!UseOldBehavior30330 && !LegacyUseOldBehavior30330)
                 {
                     var propertyClrType = columnModification.Property.GetTypeMapping().Converter?.ProviderClrType
                         ?? columnModification.Property.ClrType;