diff --git a/CHANGELOG.md b/CHANGELOG.md
index f41cff1..7e61aec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [10.2.1] - 2020-11-30
+
+Version Updated
+The version number for this package has increased due to a version update of a related graphics package.
+
 ## [10.2.0] - 2020-10-19
 
 Version Updated
diff --git a/Editor/LookDev/CameraController.cs b/Editor/LookDev/CameraController.cs
index a9761a0..87fbbb3 100644
--- a/Editor/LookDev/CameraController.cs
+++ b/Editor/LookDev/CameraController.cs
@@ -38,9 +38,24 @@ enum Direction
         bool m_InFlyMotion;
 
         bool m_IsDragging;
-        ViewTool m_BehaviorState;
         static TimeHelper s_Timer = new TimeHelper();
 
+        ViewTool m_BehaviorState;
+        ViewTool behaviorState
+        {
+            get { return m_BehaviorState; }
+            set
+            {
+                if (value != m_BehaviorState && m_BehaviorState == ViewTool.FPS)
+                {
+                    isDragging = false;
+                    inFlyMotion = false;
+                    m_DirectionKeyPressed = Direction.None;
+                }
+                m_BehaviorState = value;
+            }
+        }
+
         protected CameraState m_CameraState;
         DisplayWindow m_Window;
         protected Action m_Focused;
@@ -125,13 +140,13 @@ private void ResetCameraControl()
         {
             isDragging = false;
             inFlyMotion = false;
-            m_BehaviorState = ViewTool.None;
+            behaviorState = ViewTool.None;
         }
 
         protected virtual void OnScrollWheel(WheelEvent evt)
         {
             // See UnityEditor.SceneViewMotion.HandleScrollWheel
-            switch (m_BehaviorState)
+            switch (behaviorState)
             {
                 case ViewTool.FPS: OnChangeFPSCameraSpeed(evt); break;
                 default: OnZoom(evt); break;
@@ -140,7 +155,7 @@ protected virtual void OnScrollWheel(WheelEvent evt)
 
         void OnMouseDrag(MouseMoveEvent evt)
         {
-            switch (m_BehaviorState)
+            switch (behaviorState)
             {
                 case ViewTool.Orbit: OnMouseDragOrbit(evt); break;
                 case ViewTool.FPS: OnMouseDragFPS(evt); break;
@@ -241,7 +256,7 @@ void OnKeyDownReset(KeyDownEvent evt)
         void OnKeyUpOrDownFPS<T>(KeyboardEventBase<T> evt)
             where T : KeyboardEventBase<T>, new()
         {
-            if (m_BehaviorState != ViewTool.FPS)
+            if (behaviorState != ViewTool.FPS)
                 return;
 
             //Note: Keydown is called in loop but between first occurence of the
@@ -318,30 +333,41 @@ bool GetKeyCombinationByID(string ID, out KeyCombination combination)
                 return false;
             }
         }
-        
+
+        ViewTool GetBehaviorTool<T>(MouseEventBase<T> evt, bool onMac) where T : MouseEventBase<T>, new()
+        {
+            if (evt.button == 2)
+                return ViewTool.Pan;
+            else if (evt.button == 0 && evt.ctrlKey && onMac || evt.button == 1 && evt.altKey)
+                return ViewTool.Zoom;
+            else if (evt.button == 0)
+                return ViewTool.Orbit;
+            else if (evt.button == 1 && !evt.altKey)
+                return ViewTool.FPS;
+            return ViewTool.None;
+        }
+
         void OnMouseUp(MouseUpEvent evt)
         {
-            ResetCameraControl();
+            bool onMac = Application.platform == RuntimePlatform.OSXEditor;
+            var state = GetBehaviorTool(evt, onMac);
+
+            if (state == behaviorState)
+                ResetCameraControl();
             evt.StopPropagation();
         }
 
         void OnMouseDown(MouseDownEvent evt)
         {
             bool onMac = Application.platform == RuntimePlatform.OSXEditor;
+            behaviorState = GetBehaviorTool(evt, onMac);
 
-            if (evt.button == 2)
-                m_BehaviorState = ViewTool.Pan;
-            else if (evt.button == 0 && evt.ctrlKey && onMac || evt.button == 1 && evt.altKey)
+            if (behaviorState == ViewTool.Zoom)
             {
-                m_BehaviorState = ViewTool.Zoom;
                 m_StartZoom = m_CameraState.viewSize;
                 m_ZoomSpeed = Mathf.Max(Mathf.Abs(m_StartZoom), .3f);
                 m_TotalMotion = 0;
             }
-            else if (evt.button == 0)
-                m_BehaviorState = ViewTool.Orbit;
-            else if (evt.button == 1 && !evt.altKey)
-                m_BehaviorState = ViewTool.FPS;
 
             // see also SceneView.HandleClickAndDragToFocus()
             if (evt.button == 1 && onMac)
diff --git a/Editor/LookDev/Compositor.cs b/Editor/LookDev/Compositor.cs
index 75ef4ca..909ee29 100644
--- a/Editor/LookDev/Compositor.cs
+++ b/Editor/LookDev/Compositor.cs
@@ -200,25 +200,22 @@ public void Render()
             if (UnityEditorInternal.RenderDoc.IsLoaded() && UnityEditorInternal.RenderDoc.IsSupported() && m_RenderDocAcquisitionRequested)
                 UnityEditorInternal.RenderDoc.BeginCaptureRenderDoc(m_Displayer as EditorWindow);
 
-            using (new UnityEngine.Rendering.VolumeIsolationScope(true))
+            switch (m_Contexts.layout.viewLayout)
             {
-                switch (m_Contexts.layout.viewLayout)
-                {
-                    case Layout.FullFirstView:
-                        RenderSingleAndOutput(ViewIndex.First);
-                        break;
-                    case Layout.FullSecondView:
-                        RenderSingleAndOutput(ViewIndex.Second);
-                        break;
-                    case Layout.HorizontalSplit:
-                    case Layout.VerticalSplit:
-                        RenderSingleAndOutput(ViewIndex.First);
-                        RenderSingleAndOutput(ViewIndex.Second);
-                        break;
-                    case Layout.CustomSplit:
-                        RenderCompositeAndOutput();
-                        break;
-                }
+                case Layout.FullFirstView:
+                    RenderSingleAndOutput(ViewIndex.First);
+                    break;
+                case Layout.FullSecondView:
+                    RenderSingleAndOutput(ViewIndex.Second);
+                    break;
+                case Layout.HorizontalSplit:
+                case Layout.VerticalSplit:
+                    RenderSingleAndOutput(ViewIndex.First);
+                    RenderSingleAndOutput(ViewIndex.Second);
+                    break;
+                case Layout.CustomSplit:
+                    RenderCompositeAndOutput();
+                    break;
             }
 
             //TODO: make integration EditorWindow agnostic!
diff --git a/Editor/LookDev/DisplayWindow.cs b/Editor/LookDev/DisplayWindow.cs
index d301482..27ad36a 100644
--- a/Editor/LookDev/DisplayWindow.cs
+++ b/Editor/LookDev/DisplayWindow.cs
@@ -249,16 +249,10 @@ void ReloadStyleSheets()
                     rootVisualElement.styleSheets.Add(styleSheetLight);
             }
         }
-
-        void OnEnable()
+        
+        void CreateGUI()
         {
-            //Stylesheet
-            // Try to load stylesheet. Timing can be odd while upgrading packages (case 1219692).
-            // In this case, it will be fixed in OnGUI. Though it can spawn error while reimporting assets.
-            // Waiting for filter on stylesheet (case 1228706) to remove last error.
-            // On Editor Skin change, OnEnable is called and stylesheets need to be reloaded (case 1278802).
-            if(EditorApplication.isUpdating)
-                ReloadStyleSheets();
+            ReloadStyleSheets();
 
             //Call the open function to configure LookDev
             // in case the window where open when last editor session finished.
@@ -284,7 +278,10 @@ void OnEnable()
 
             ApplyLayout(viewLayout);
             ApplySidePanelChange(layout.showedSidePanel);
+        }
 
+        void OnEnable()
+        { 
             Undo.undoRedoPerformed += FullRefreshEnvironmentList;
         }
 
@@ -672,60 +669,6 @@ void Update()
 
         void OnGUI()
         {
-            //Stylesheet
-            // [case 1219692] if LookDev is open while reimporting CoreRP package,
-            // stylesheet can be null. In this case, we can have a null stylesheet
-            // registered as it got destroyed. Reloading it. As we cannot just
-            // remove a null entry, we must filter and reconstruct the while list.
-            if (styleSheet == null || styleSheet.Equals(null)
-                || (!EditorGUIUtility.isProSkin && (styleSheetLight == null || styleSheetLight.Equals(null))))
-            {
-                // While (case 1228706) is still on going, we sill close and reopen the look dev.
-                // This will prevent spawning error at frame.
-                // Note 2: This actually causes the lookdev to break completely with light theme.
-                // Until the actual issue is fixed, we'll comment this fix out as it only concerns an upgrade problem.
-                //LookDev.Close();
-                //LookDev.Open();
-                //return;
-
-                // Following lines is the correct fix if UIElement filter garbage collected Stylesheet.
-
-                //System.Collections.Generic.List<StyleSheet> usedStyleSheets = new System.Collections.Generic.List<StyleSheet>();
-                //int currentCount = rootVisualElement.styleSheets.count;
-                //for (int i = 0; i < currentCount; ++i)
-                //{
-                //    StyleSheet sheet = rootVisualElement.styleSheets[i];
-                //    if (sheet != null && !sheet.Equals(null))
-                //        usedStyleSheets.Add(sheet);
-                //}
-                //rootVisualElement.styleSheets.Clear();
-                //foreach (StyleSheet sheet in usedStyleSheets)
-                //    rootVisualElement.styleSheets.Add(sheet);
-
-                //styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss);
-                //if (styleSheet != null && !styleSheet.Equals(null))
-                //{
-                //    rootVisualElement.styleSheets.Add(styleSheet);
-                //    if (!EditorGUIUtility.isProSkin)
-                //    {
-                //        rootVisualElement.styleSheets.Add(
-                //            AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload));
-                //    }
-                //}
-
-                //if (styleSheet == null || styleSheet.Equals(null))
-                //{
-                //    styleSheet = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss);
-                //    if (styleSheet != null && !styleSheet.Equals(null))
-                //        rootVisualElement.styleSheets.Add(styleSheet);
-                //}
-                //if (!EditorGUIUtility.isProSkin && styleSheetLight != null && !styleSheetLight.Equals(null))
-                //{
-                //    styleSheetLight = AssetDatabase.LoadAssetAtPath<StyleSheet>(Style.k_uss_personal_overload);
-                //    if (styleSheetLight != null && !styleSheetLight.Equals(null))
-                //        rootVisualElement.styleSheets.Add(styleSheetLight);
-                //}
-            }
             if(EditorApplication.isUpdating)
                 return;
            
diff --git a/Editor/RenderGraph/RenderGraphViewer.cs b/Editor/RenderGraph/RenderGraphViewer.cs
index d945e37..bf654c8 100644
--- a/Editor/RenderGraph/RenderGraphViewer.cs
+++ b/Editor/RenderGraph/RenderGraphViewer.cs
@@ -111,8 +111,19 @@ void RenderPassLabelChanged(GeometryChangedEvent evt)
 
         var topRowElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.TopRowElement");
         topRowElement.style.minHeight = passNamesContainerHeight;
+
     }
 
+    void LastRenderPassLabelChanged(GeometryChangedEvent evt)
+    {
+        var label = evt.currentTarget as Label;
+        Vector2 textSize = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined);
+        float textWidth = Mathf.Max(kRenderPassWidth, textSize.x);
+
+        // Keep a margin on the right of the container to avoid label being clipped.
+        var viewerContainer = m_GraphViewerElement.Q<VisualElement>("GraphViewer.ViewerContainer");
+        viewerContainer.style.marginRight = Mathf.Max(viewerContainer.style.marginRight.value.value, (textWidth - kRenderPassWidth));
+    }
 
     void UpdateResourceLifetimeColor(int passIndex, StyleColor colorRead, StyleColor colorWrite)
     {
@@ -164,7 +175,7 @@ void UpdatePassColor((int index, int resourceType) resInfo, StyleColor colorRead
             VisualElement passElement = m_PassElementsInfo[consumer].pass;
             if (passElement != null)
             {
-                VisualElement passButton = passElement.Q("PassCell");
+                VisualElement passButton = passElement.Q("RenderPass.Cell");
                 passButton.style.backgroundColor = colorRead;
             }
         }
@@ -178,7 +189,7 @@ void UpdatePassColor((int index, int resourceType) resInfo, StyleColor colorRead
             VisualElement passElement = m_PassElementsInfo[producer].pass;
             if (passElement != null)
             {
-                VisualElement passButton = passElement.Q("PassCell");
+                VisualElement passButton = passElement.Q("RenderPass.Cell");
                 passButton.style.backgroundColor = colorWrite;
             }
         }
@@ -215,13 +226,14 @@ void MouseLeaveResourceCallback(MouseLeaveEvent evt, (int index, int resourceTyp
     VisualElement CreateRenderPass(string name, int index, bool culled)
     {
         var container = new VisualElement();
+        container.name = "RenderPass";
         container.style.width = kRenderPassWidth;
         container.style.overflow = Overflow.Visible;
         container.style.flexDirection = FlexDirection.ColumnReverse;
         container.style.minWidth = kRenderPassWidth;
 
         var cell = new Button();
-        cell.name = "PassCell";
+        cell.name = "RenderPass.Cell";
         cell.style.marginBottom = 0.0f;
         cell.style.marginLeft = 0.0f;
         cell.style.marginRight = 0.0f;
@@ -237,6 +249,7 @@ VisualElement CreateRenderPass(string name, int index, bool culled)
         container.Add(cell);
 
         var label = new Label(name);
+        label.name = "RenderPass.Label";
         label.transform.rotation = Quaternion.Euler(new Vector3(0.0f, 0.0f, -45.0f));
         container.Add(label);
 
@@ -247,21 +260,24 @@ VisualElement CreateRenderPass(string name, int index, bool culled)
 
     void ResourceNamesContainerChanged(GeometryChangedEvent evt)
     {
+        var label = evt.currentTarget as Label;
+        float textWidth = label.MeasureTextSize(label.text, 0, VisualElement.MeasureMode.Undefined, 10, VisualElement.MeasureMode.Undefined).x;
+
         var cornerElement = m_GraphViewerElement.Q<VisualElement>("GraphViewer.Corner");
-        cornerElement.style.width = Mathf.Max(evt.newRect.width, cornerElement.style.width.value.value);
-        cornerElement.style.minWidth = Mathf.Max(evt.newRect.width, cornerElement.style.minWidth.value.value);
+        cornerElement.style.width = Mathf.Max(textWidth, cornerElement.style.width.value.value);
+        cornerElement.style.minWidth = Mathf.Max(textWidth, cornerElement.style.minWidth.value.value);
 
         // We need to make sure all resource types have the same width
         m_GraphViewerElement.Query("GraphViewer.Resources.ResourceNames").Build().ForEach((elem) =>
         {
-            elem.style.width = Mathf.Max(evt.newRect.width, elem.style.width.value.value);
-            elem.style.minWidth = Mathf.Max(evt.newRect.width, elem.style.minWidth.value.value);
+            elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
+            elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
         });
 
         m_GraphViewerElement.Query("GraphViewer.Resources.ResourceTypeName").Build().ForEach((elem) =>
         {
-            elem.style.width = Mathf.Max(evt.newRect.width, elem.style.width.value.value);
-            elem.style.minWidth = Mathf.Max(evt.newRect.width, elem.style.minWidth.value.value);
+            elem.style.width = Mathf.Max(textWidth, elem.style.width.value.value);
+            elem.style.minWidth = Mathf.Max(textWidth, elem.style.minWidth.value.value);
         });
     }
 
@@ -269,6 +285,9 @@ VisualElement CreateResourceLabel(string name, bool imported)
     {
         var label = new Label(name);
         label.style.height = kResourceHeight;
+        label.style.overflow = Overflow.Hidden;
+        label.style.textOverflow = TextOverflow.Ellipsis;
+        label.style.unityTextOverflowPosition = TextOverflowPosition.End;
         if (imported)
             label.style.color = m_ImportedResourceColor;
         else
@@ -388,6 +407,7 @@ VisualElement CreateTopRowWithPasses(RenderGraphDebugData debugData, out int fin
 
         int passIndex = 0;
         finalPassCount = 0;
+        int lastValidPassIndex = -1;
         foreach (var pass in debugData.passList)
         {
             if ((pass.culled && !m_Filter.HasFlag(Filter.CulledPasses)) || !pass.generateDebugData)
@@ -401,10 +421,17 @@ VisualElement CreateTopRowWithPasses(RenderGraphDebugData debugData, out int fin
                 m_PassElementsInfo[passIndex].remap = finalPassCount;
                 passNamesElement.Add(passElement);
                 finalPassCount++;
+                lastValidPassIndex = passIndex;
             }
             passIndex++;
         }
 
+        if (lastValidPassIndex > 0)
+        {
+            var label = m_PassElementsInfo[lastValidPassIndex].pass.Q<Label>("RenderPass.Label");
+            label.RegisterCallback<GeometryChangedEvent>(LastRenderPassLabelChanged);
+        }
+
         topRowElement.Add(passNamesElement);
 
         return topRowElement;
@@ -421,7 +448,6 @@ VisualElement CreateResourceViewer(RenderGraphDebugData debugData, int resourceT
         resourceNamesContainer.style.flexDirection = FlexDirection.Column;
         resourceNamesContainer.style.overflow = Overflow.Hidden;
         resourceNamesContainer.style.alignItems = Align.FlexEnd;
-        resourceNamesContainer.RegisterCallback<GeometryChangedEvent>(ResourceNamesContainerChanged);
 
         var resourcesLifeTimeElement = new VisualElement();
         resourcesLifeTimeElement.name = "GraphViewer.Resources.ResourceLifeTime";
@@ -475,13 +501,16 @@ void RebuildGraphViewerUI()
         m_PassElementsInfo.Resize(debugData.passList.Count);
 
         var horizontalScrollView = new ScrollView(ScrollViewMode.Horizontal);
+        horizontalScrollView.name = "GraphViewer.HorizontalScrollView";
 
         var graphViewerElement = new VisualElement();
+        graphViewerElement.name = "GraphViewer.ViewerContainer";
         graphViewerElement.style.flexDirection = FlexDirection.Column;
 
         var topRowElement = CreateTopRowWithPasses(debugData, out int finalPassCount);
 
         var resourceScrollView = new ScrollView(ScrollViewMode.Vertical);
+        resourceScrollView.name = "GraphViewer.ResourceScrollView";
 
         // Has to match RenderGraphModule.RenderGraphResourceType order.
         Filter[] resourceFilterFlags = { Filter.Textures, Filter.ComputeBuffers };
@@ -497,6 +526,7 @@ void RebuildGraphViewerUI()
                 resourceNameLabel.style.unityTextAlign = TextAnchor.MiddleRight;
                 resourceNameLabel.style.unityFontStyleAndWeight = FontStyle.Bold;
                 resourceNameLabel.style.fontSize = 13;
+                resourceNameLabel.RegisterCallback<GeometryChangedEvent>(ResourceNamesContainerChanged);
                 resourceScrollView.Add(resourceNameLabel);
                 resourceScrollView.Add(resourceViewerElement);
 
@@ -538,6 +568,7 @@ void RebuildUI()
 
         m_GraphViewerElement = new VisualElement();
         m_GraphViewerElement.name = "GraphViewer";
+        m_GraphViewerElement.style.marginLeft = 20.0f; // Margin on the left of resource labels.
         m_GraphViewerElement.style.flexDirection = FlexDirection.Column;
 
         RebuildGraphViewerUI();
diff --git a/Editor/Volume/VolumeComponentEditor.cs b/Editor/Volume/VolumeComponentEditor.cs
index fd35bfe..63fa568 100644
--- a/Editor/Volume/VolumeComponentEditor.cs
+++ b/Editor/Volume/VolumeComponentEditor.cs
@@ -319,7 +319,7 @@ protected SerializedDataParameter Unpack(SerializedProperty property)
         /// <param name="property">The property to draw in the editor</param>
         protected void PropertyField(SerializedDataParameter property)
         {
-            var title = EditorGUIUtility.TrTextContent(property.displayName);
+            var title = EditorGUIUtility.TrTextContent(property.displayName, property.GetAttribute<TooltipAttribute>()?.tooltip);
             PropertyField(property, title);
         }
 
diff --git a/Runtime/Volume/VolumeManager.cs b/Runtime/Volume/VolumeManager.cs
index 821154e..866bab0 100644
--- a/Runtime/Volume/VolumeManager.cs
+++ b/Runtime/Volume/VolumeManager.cs
@@ -14,8 +14,6 @@ namespace UnityEngine.Rendering
     /// </summary>
     public sealed class VolumeManager
     {
-        internal static bool needIsolationFilteredByRenderer = false;
-
         static readonly Lazy<VolumeManager> s_Instance = new Lazy<VolumeManager>(() => new VolumeManager());
 
         /// <summary>
@@ -319,18 +317,12 @@ public void Update(VolumeStack stack, Transform trigger, LayerMask layerMask)
             if (!onlyGlobal)
                 trigger.TryGetComponent<Camera>(out camera);
 
-#if UNITY_EDITOR
-            // requested or prefab isolation mode.
-            bool needIsolation = needIsolationFilteredByRenderer || (UnityEditor.SceneManagement.StageUtility.GetCurrentStageHandle() != UnityEditor.SceneManagement.StageUtility.GetMainStageHandle());
-#endif
-
             // Traverse all volumes
             foreach (var volume in volumes)
             {
 #if UNITY_EDITOR
                 // Skip volumes that aren't in the scene currently displayed in the scene view
-                if (needIsolation
-                    && !IsVolumeRenderedByCamera(volume, camera))
+                if (!IsVolumeRenderedByCamera(volume, camera))
                     continue;
 #endif
 
@@ -469,19 +461,18 @@ static bool IsVolumeRenderedByCamera(Volume volume, Camera camera)
     /// <summary>
     /// A scope in which a Camera filters a Volume.
     /// </summary>
+    [Obsolete("VolumeIsolationScope is deprecated, it does not have any effect anymore.")]
     public struct VolumeIsolationScope : IDisposable
     {
         /// <summary>
         /// Constructs a scope in which a Camera filters a Volume.
         /// </summary>
         /// <param name="unused">Unused parameter.</param>
-        public VolumeIsolationScope(bool unused)
-            => VolumeManager.needIsolationFilteredByRenderer = true;
+        public VolumeIsolationScope(bool unused) {}
 
         /// <summary>
         /// Stops the Camera from filtering a Volume.
         /// </summary>
-        void IDisposable.Dispose()
-            => VolumeManager.needIsolationFilteredByRenderer = false;
+        void IDisposable.Dispose() {}
     }
 }
diff --git a/ShaderLibrary/GeometricTools.hlsl b/ShaderLibrary/GeometricTools.hlsl
index 999aedd..45a0620 100644
--- a/ShaderLibrary/GeometricTools.hlsl
+++ b/ShaderLibrary/GeometricTools.hlsl
@@ -35,7 +35,7 @@ bool SolveQuadraticEquation(float a, float b, float c, out float2 roots)
 {
     float d = b * b - 4 * a * c;
     float q = -0.5 * (b + CopySign(sqrt(d), b));
-    roots   = float2(q / a, c / q);
+    roots   = float2(c / q, q / a);
 
     return (d >= 0);
 }
@@ -93,25 +93,8 @@ bool IntersectRaySphere(float3 start, float3 dir, float radius, out float2 inter
     float a = dot(dir, dir);
     float b = dot(dir, start) * 2.0;
     float c = dot(start, start) - radius * radius;
-    float discriminant = b * b - 4.0 * a * c;
 
-    bool intersect = false;
-    intersections = float2(0.0, 0.0);
-
-    if (discriminant < 0.0 || a == 0.0)
-    {
-        intersections.x = 0.0;
-        intersections.y = 0.0;
-    }
-    else
-    {
-        float sqrtDiscriminant = sqrt(discriminant);
-        intersections.x = (-b - sqrtDiscriminant) / (2.0 * a);
-        intersections.y = (-b + sqrtDiscriminant) / (2.0 * a);
-        intersect = true;
-    }
-
-    return intersect;
+    return SolveQuadraticEquation(a, b, c, intersections);
 }
 
 // This simplified version assume that we care about the result only when we are inside the sphere
diff --git a/ShaderLibrary/ImageBasedLighting.hlsl b/ShaderLibrary/ImageBasedLighting.hlsl
index acc2075..bf98957 100644
--- a/ShaderLibrary/ImageBasedLighting.hlsl
+++ b/ShaderLibrary/ImageBasedLighting.hlsl
@@ -178,6 +178,54 @@ void SampleAnisoGGXDir(real2 u,
     L = 2.0 * saturate(dot(V, H)) * H - V;
 }
 
+// Adapted from: "Sampling the GGX Distribution of Visible Normals", by E. Heitz
+// http://jcgt.org/published/0007/04/01/paper.pdf
+void SampleAnisoGGXVisibleNormal(float2 u,
+                                 float3 V,
+                                 float3x3 localToWorld,
+                                 float roughnessX,
+                                 float roughnessY,
+                             out float3 localV,
+                             out float3 localH,
+                             out float  VdotH)
+{
+    localV = mul(V, transpose(localToWorld));
+
+    // Construct an orthonormal basis around the stretched view direction
+    float3x3 viewToLocal;
+    viewToLocal[2] = normalize(float3(roughnessX * localV.x, roughnessY * localV.y, localV.z));
+    viewToLocal[0] = (viewToLocal[2].z < 0.9999) ? normalize(cross(float3(0, 0, 1), viewToLocal[2])) : float3(1, 0, 0);
+    viewToLocal[1] = cross(viewToLocal[2], viewToLocal[0]);
+
+    // Compute a sample point with polar coordinates (r, phi)
+    float r   = sqrt(u.x);
+    float phi = 2.0 * PI * u.y;
+    float t1  = r * cos(phi);
+    float t2  = r * sin(phi);
+    float s  = 0.5 * (1.0 + viewToLocal[2].z);
+    t2 = (1.0 - s) * sqrt(1.0 - t1 * t1) + s * t2;
+
+    // Reproject onto hemisphere
+    localH = t1 * viewToLocal[0] + t2 * viewToLocal[1] + sqrt(max(0.0, 1.0 - t1 * t1 - t2 * t2)) * viewToLocal[2];
+
+    // Transform the normal back to the ellipsoid configuration
+    localH = normalize(float3(roughnessX * localH.x, roughnessY * localH.y, max(0.0, localH.z)));
+
+    VdotH = saturate(dot(localV, localH));
+}
+
+// GGX vsible normal sampling, isotropic variant
+void SampleGGXVisibleNormal(float2 u,
+                            float3 V,
+                            float3x3 localToWorld,
+                            float roughness,
+                        out float3 localV,
+                        out float3 localH,
+                        out float  VdotH)
+{
+    SampleAnisoGGXVisibleNormal(u, V, localToWorld, roughness, roughness, localV, localH, VdotH);
+}
+
 // weightOverPdf return the weight (without the diffuseAlbedo term) over pdf. diffuseAlbedo term must be apply by the caller.
 void ImportanceSampleLambert(real2   u,
                              real3x3 localToWorld,
diff --git a/ValidationExceptions.json b/ValidationExceptions.json
index 3fa911b..d79c556 100644
--- a/ValidationExceptions.json
+++ b/ValidationExceptions.json
@@ -4,7 +4,7 @@
         {
              "ValidationTest": "API Validation",
 			 "ExceptionError": "Breaking changes require a new major version.",
-             "PackageVersion": "10.2.0"
+             "PackageVersion": "10.2.1"
         }
     ]
 }
diff --git a/package.json b/package.json
index 742aa2c..8e6697b 100644
--- a/package.json
+++ b/package.json
@@ -1,19 +1,19 @@
 {
   "name": "com.unity.render-pipelines.core",
   "description": "SRP Core makes it easier to create or customize a Scriptable Render Pipeline (SRP). SRP Core contains reusable code, including boilerplate code for working with platform-specific graphics APIs, utility functions for common rendering operations, and  shader libraries. The code in SRP Core is use by the High Definition Render Pipeline (HDRP) and Universal Render Pipeline (URP). If you are creating a custom SRP from scratch or customizing a prebuilt SRP, using SRP Core will save you time.",
-  "version": "10.2.0",
+  "version": "10.2.1",
   "unity": "2020.2",
-  "unityRelease": "0b8",
+  "unityRelease": "0b12",
   "displayName": "Core RP Library",
   "dependencies": {
     "com.unity.ugui": "1.0.0"
   },
   "upmCi": {
-    "footprint": "f552ac4141f00947ea390dd6d54a3490e2663c74"
+    "footprint": "df7b3f82cbc9063058325b49710c3ba0dcc0049b"
   },
   "repository": {
     "url": "https://github.com/Unity-Technologies/Graphics.git",
     "type": "git",
-    "revision": "2dbb8ac2491b6e5be0b2f740374609a83236eeb3"
+    "revision": "bfab2b98da39feb0863638285da6c906b82a4830"
   }
 }