diff --git a/src/Avalonia.Base/Animation/Animatable.cs b/src/Avalonia.Base/Animation/Animatable.cs
index edaa76233e..eddb89c3e8 100644
--- a/src/Avalonia.Base/Animation/Animatable.cs
+++ b/src/Avalonia.Base/Animation/Animatable.cs
@@ -27,6 +27,7 @@ namespace Avalonia.Animation
             AvaloniaProperty.Register<Animatable, Transitions?>(nameof(Transitions));
 
         private bool _transitionsEnabled = true;
+        private bool _isSubscribedToTransitionsCollection = false;
         private Dictionary<ITransition, TransitionState>? _transitionState;
 
         /// <summary>
@@ -62,6 +63,11 @@ namespace Avalonia.Animation
 
                 if (Transitions is object)
                 {
+                    if (!_isSubscribedToTransitionsCollection)
+                    {
+                        _isSubscribedToTransitionsCollection = true;
+                        Transitions.CollectionChanged += TransitionsCollectionChanged;
+                    }
                     AddTransitions(Transitions);
                 }
             }
@@ -72,7 +78,7 @@ namespace Avalonia.Animation
         /// </summary>
         /// <remarks>
         /// This method should not be called from user code, it will be called automatically by the framework
-        /// when a control is added to the visual tree.
+        /// when a control is removed from the visual tree.
         /// </remarks>
         protected void DisableTransitions()
         {
@@ -82,6 +88,11 @@ namespace Avalonia.Animation
 
                 if (Transitions is object)
                 {
+                    if (_isSubscribedToTransitionsCollection)
+                    {
+                        _isSubscribedToTransitionsCollection = false;
+                        Transitions.CollectionChanged -= TransitionsCollectionChanged;
+                    }
                     RemoveTransitions(Transitions);
                 }
             }
@@ -110,6 +121,7 @@ namespace Avalonia.Animation
                     }
 
                     newTransitions.CollectionChanged += TransitionsCollectionChanged;
+                    _isSubscribedToTransitionsCollection = true;
                     AddTransitions(toAdd);
                 }
 
diff --git a/src/Avalonia.Controls/ScrollViewer.cs b/src/Avalonia.Controls/ScrollViewer.cs
index 1c23919d0e..ab114da933 100644
--- a/src/Avalonia.Controls/ScrollViewer.cs
+++ b/src/Avalonia.Controls/ScrollViewer.cs
@@ -154,15 +154,15 @@ namespace Avalonia.Controls
         /// <summary>
         /// Defines the <see cref="HorizontalSnapPointsType"/> property.
         /// </summary>
-        public static readonly StyledProperty<SnapPointsType> HorizontalSnapPointsTypeProperty =
-            AvaloniaProperty.Register<ScrollViewer, SnapPointsType>(
+        public static readonly AttachedProperty<SnapPointsType> HorizontalSnapPointsTypeProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, SnapPointsType>(
                 nameof(HorizontalSnapPointsType));
 
         /// <summary>
         /// Defines the <see cref="VerticalSnapPointsType"/> property.
         /// </summary>
-        public static readonly StyledProperty<SnapPointsType> VerticalSnapPointsTypeProperty =
-            AvaloniaProperty.Register<ScrollViewer, SnapPointsType>(
+        public static readonly AttachedProperty<SnapPointsType> VerticalSnapPointsTypeProperty =
+            AvaloniaProperty.RegisterAttached<ScrollViewer, Control, SnapPointsType>(
                 nameof(VerticalSnapPointsType));
 
         /// <summary>
@@ -625,6 +625,86 @@ namespace Avalonia.Controls
             control.SetValue(HorizontalScrollBarVisibilityProperty, value);
         }
 
+        /// <summary>
+        /// Gets the value of the HorizontalSnapPointsType attached property.
+        /// </summary>
+        /// <param name="control">The control to read the value from.</param>
+        /// <returns>The value of the property.</returns>
+        public static SnapPointsType GetHorizontalSnapPointsType(Control control)
+        {
+            return control.GetValue(HorizontalSnapPointsTypeProperty);
+        }
+
+        /// <summary>
+        /// Gets the value of the HorizontalSnapPointsType attached property.
+        /// </summary>
+        /// <param name="control">The control to set the value on.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetHorizontalSnapPointsType(Control control, SnapPointsType value)
+        {
+            control.SetValue(HorizontalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the VerticalSnapPointsType attached property.
+        /// </summary>
+        /// <param name="control">The control to read the value from.</param>
+        /// <returns>The value of the property.</returns>
+        public static SnapPointsType GetVerticalSnapPointsType(Control control)
+        {
+            return control.GetValue(VerticalSnapPointsTypeProperty);
+        }
+
+        /// <summary>
+        /// Gets the value of the VerticalSnapPointsType attached property.
+        /// </summary>
+        /// <param name="control">The control to set the value on.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetVerticalSnapPointsType(Control control, SnapPointsType value)
+        {
+            control.SetValue(VerticalSnapPointsTypeProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the HorizontalSnapPointsAlignment attached property.
+        /// </summary>
+        /// <param name="control">The control to read the value from.</param>
+        /// <returns>The value of the property.</returns>
+        public static SnapPointsAlignment GetHorizontalSnapPointsAlignment(Control control)
+        {
+            return control.GetValue(HorizontalSnapPointsAlignmentProperty);
+        }
+
+        /// <summary>
+        /// Gets the value of the HorizontalSnapPointsAlignment attached property.
+        /// </summary>
+        /// <param name="control">The control to set the value on.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetHorizontalSnapPointsAlignment(Control control, SnapPointsAlignment value)
+        {
+            control.SetValue(HorizontalSnapPointsAlignmentProperty, value);
+        }
+
+        /// <summary>
+        /// Gets the value of the VerticalSnapPointsAlignment attached property.
+        /// </summary>
+        /// <param name="control">The control to read the value from.</param>
+        /// <returns>The value of the property.</returns>
+        public static SnapPointsAlignment GetVerticalSnapPointsAlignment(Control control)
+        {
+            return control.GetValue(VerticalSnapPointsAlignmentProperty);
+        }
+
+        /// <summary>
+        /// Gets the value of the VerticalSnapPointsAlignment attached property.
+        /// </summary>
+        /// <param name="control">The control to set the value on.</param>
+        /// <param name="value">The value of the property.</param>
+        public static void SetVerticalSnapPointsAlignment(Control control, SnapPointsAlignment value)
+        {
+            control.SetValue(VerticalSnapPointsAlignmentProperty, value);
+        }
+
         /// <summary>
         /// Gets the value of the VerticalScrollBarVisibility attached property.
         /// </summary>
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
index 135ab0426e..c293a9101d 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.ListProxy.cs
@@ -112,7 +112,7 @@ class Template
 
             var defs = cl.Members.OfType<MethodDeclarationSyntax>().First(m => m.Identifier.Text == "InitializeDefaults");
 
-            cl = cl.ReplaceNode(defs.Body, defs.Body.AddStatements(
+            cl = cl.ReplaceNode(defs.Body!, defs.Body!.AddStatements(
 
                 ParseStatement($"_list = new ServerListProxyHelper<{itemType}, {serverItemType}>(this);")));
           
diff --git a/src/tools/DevGenerators/CompositionGenerator/Generator.cs b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
index 3b5d3d8c3f..dfc8b45579 100644
--- a/src/tools/DevGenerators/CompositionGenerator/Generator.cs
+++ b/src/tools/DevGenerators/CompositionGenerator/Generator.cs
@@ -297,8 +297,8 @@ namespace Avalonia.SourceGenerator.CompositionGenerator
                         server = server.WithBaseList(
                             server.BaseList?.AddTypes(SimpleBaseType(ParseTypeName(impl.ServerName))));
 
-                    client = client.AddMembers(
-                        ParseMemberDeclaration($"{impl.ServerName} {impl.Name}.Server => Server;"));
+                    if(ParseMemberDeclaration($"{impl.ServerName} {impl.Name}.Server => Server;") is { } member)
+                        client = client.AddMembers(member);
                 }
 
 
diff --git a/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
index 86dbb3a452..c975bb8444 100644
--- a/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
+++ b/src/tools/DevGenerators/EnumMemberDictionaryGenerator.cs
@@ -32,7 +32,7 @@ public class EnumMemberDictionaryGenerator : IIncrementalGenerator
             ).Collect();
         context.RegisterSourceOutput(all, static (context, methods) =>
         {
-            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            foreach (var typeGroup in methods.GroupBy<IMethodSymbol,ISymbol>(f => f.ContainingType, SymbolEqualityComparer.Default))
             {
                 var classBuilder = new StringBuilder();
                 if (typeGroup.Key.ContainingNamespace != null)
diff --git a/src/tools/DevGenerators/GetProcAddressInitialization.cs b/src/tools/DevGenerators/GetProcAddressInitialization.cs
index aedc13e7f6..e8d7c251fa 100644
--- a/src/tools/DevGenerators/GetProcAddressInitialization.cs
+++ b/src/tools/DevGenerators/GetProcAddressInitialization.cs
@@ -34,7 +34,7 @@ public class GetProcAddressInitializationGenerator : IIncrementalGenerator
         var all = fieldsWithAttribute.Collect();
         context.RegisterSourceOutput(all, static (context, methods) =>
         {
-            foreach (var typeGroup in methods.GroupBy(f => f.ContainingType, SymbolEqualityComparer.Default))
+            foreach (var typeGroup in methods.GroupBy<IMethodSymbol,ISymbol>(f => f.ContainingType, SymbolEqualityComparer.Default))
             {
                 var nextContext = 0;
                 var contexts = new Dictionary<string, int>();