diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5ebee4..a4fbf25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,17 @@
 # Changelog
 
+## [6.2.2] - 2021-02-15
+- Update C# assemblies to compile with "warnings as errors"
+- Fix usage of obsolete APIs from XR Managment
+- Fix an issue where eyetracking would fail in ZI.
+
 ## [6.2.0] - 2021-02-02
 - Downgrade to AR Subsystems `4.0.12`
 
 ## [6.1.0] - 2021-01-28
 - Bump minimum Unity version to `2020.2`
 - Update XR Management to `4.0.1`
+- Fixed a bug where setting 'Force Multipass' to true was being ignored.
 - Fixed a case where hands weren't properly shutdown when stopping the XR Input subsystem
 
 ## [6.1.0-preview.2] - 2021-01-05
diff --git a/Editor/MagicLeapBuildProcessor.cs b/Editor/MagicLeapBuildProcessor.cs
index cf9cc34..5511185 100644
--- a/Editor/MagicLeapBuildProcessor.cs
+++ b/Editor/MagicLeapBuildProcessor.cs
@@ -49,7 +49,7 @@ public bool ShouldIncludeRuntimePluginsInBuild(string path)
             if (generalSettings == null)
                 return false;
 
-            foreach (var loader in generalSettings.Manager.loaders)
+            foreach (var loader in generalSettings.Manager.activeLoaders)
             {
                 if (loader is MagicLeapLoader)
                     return true;
diff --git a/Runtime/Lumin/UnityMagicLeap.so b/Runtime/Lumin/UnityMagicLeap.so
index 08d69fc..2d19a13 100644
Binary files a/Runtime/Lumin/UnityMagicLeap.so and b/Runtime/Lumin/UnityMagicLeap.so differ
diff --git a/Runtime/MagicLeapLoader.cs b/Runtime/MagicLeapLoader.cs
index 6e0eaa6..79856cd 100644
--- a/Runtime/MagicLeapLoader.cs
+++ b/Runtime/MagicLeapLoader.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Linq;
 using System.Runtime.InteropServices;
 
 using UnityEngine.XR;
@@ -187,6 +188,10 @@ public override bool Start()
 
             if (!isLegacyDeviceActive)
             {
+                StartSubsystem<XRDisplaySubsystem>();
+
+                // we need to set the layout after the display subsystem has started, as these values are not used during
+                // the XRDisplayProvider's startup (Starting the Subsystem).
                 var settings = MagicLeapSettings.currentSettings;
 #if UNITY_2020_1_OR_NEWER
                 if (settings != null && settings.forceMultipass)
@@ -199,7 +204,6 @@ public override bool Start()
                 else
                     displaySubsystem.singlePassRenderingDisabled = false;
 #endif // UNITY_2020_1_OR_NEWER
-                StartSubsystem<XRDisplaySubsystem>();
                 m_DisplaySubsystemRunning = true;
             }
             return true;
@@ -320,7 +324,7 @@ internal static class XRMangementEditorExtensions
         internal static bool IsEnabledForPlatform(this XRLoader loader, BuildTargetGroup group)
         {
             var settings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(group);
-            return settings?.Manager?.loaders?.Contains(loader) ?? false;
+            return settings?.Manager?.activeLoaders?.Contains(loader) ?? false;
         }
 
         internal static bool IsEnabledForPlatform(this XRLoader loader, BuildTarget target)
diff --git a/Runtime/Windows/UnityMagicLeap.dll b/Runtime/Windows/UnityMagicLeap.dll
index f847c91..413aa0b 100644
Binary files a/Runtime/Windows/UnityMagicLeap.dll and b/Runtime/Windows/UnityMagicLeap.dll differ
diff --git a/Runtime/Windows/UnityMagicLeap.dll.lib b/Runtime/Windows/UnityMagicLeap.dll.lib
index 491ccf4..15f1546 100644
Binary files a/Runtime/Windows/UnityMagicLeap.dll.lib and b/Runtime/Windows/UnityMagicLeap.dll.lib differ
diff --git a/Runtime/macOS/UnityMagicLeap.bundle b/Runtime/macOS/UnityMagicLeap.bundle
index 0854b9c..595b4b8 100644
Binary files a/Runtime/macOS/UnityMagicLeap.bundle and b/Runtime/macOS/UnityMagicLeap.bundle differ
diff --git a/Tests/Runtime/Unity.XR.MagicLeap.Tests.asmdef b/Tests/Runtime/Unity.XR.MagicLeap.Tests.asmdef
index d55c308..250b0c8 100644
--- a/Tests/Runtime/Unity.XR.MagicLeap.Tests.asmdef
+++ b/Tests/Runtime/Unity.XR.MagicLeap.Tests.asmdef
@@ -6,5 +6,9 @@
     ],
     "references": [
         "UnityEngine.XR.MagicLeap"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [
+        "UNITY_INCLUDE_TESTS"
     ]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 5af707d..caaec31 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.unity.xr.magicleap",
   "displayName": "Magic Leap XR Plugin",
-  "version": "6.2.0",
+  "version": "6.2.2",
   "unity": "2020.2",
   "description": "Provides rendering and spatial mapping support for Magic Leap.\n\nNOTE: As of Unity 2019.2, Legacy XR support for MagicLeap is disabled in favor of XR SDK",
   "keywords": [
@@ -22,12 +22,12 @@
     "com.unity.xr.management": "4.0.1"
   },
   "upmCi": {
-    "footprint": "faa3dca49e5ced7b40097b7668dab6dba8cad4d3"
+    "footprint": "eb3f6b32a5acd473b7a67c9c93df4f7975eaaa22"
   },
   "repository": {
     "url": "https://github.cds.internal.unity3d.com/unity/xr.sdk.magicleap.git",
     "type": "git",
-    "revision": "4f8fd329cae742cc7fc7291045094c97f02d26f8"
+    "revision": "0c951c7b40e1977d835807ffad84eaa18345ec1a"
   },
   "samples": [
     {