diff --git a/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs b/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
index 10ddf3587241f5f7af69e381e18c62d98dc470ee..66377b03ce0661f349d1cc03c89d21c76fe448de 100644
--- a/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
+++ b/Assets/NavMeshComponents/Scripts/NavMeshSurface.cs
@@ -373,7 +373,7 @@ bool UnshareNavMeshAsset()
                 return false;
 
             // An instance can share asset reference only with its prefab parent
-            var prefab = UnityEditor.PrefabUtility.GetPrefabParent(this) as NavMeshSurface;
+            var prefab = UnityEditor.PrefabUtility.GetCorrespondingObjectFromSource(this) as NavMeshSurface;
             if (prefab != null && prefab.navMeshData == navMeshData)
                 return false;
 
diff --git a/UnityPackageManager/manifest.json b/Packages/manifest.json
similarity index 100%
rename from UnityPackageManager/manifest.json
rename to Packages/manifest.json
diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
index f0f965c4bc241162831bc960baf56762125831a5..99d48fd6b6a020ecf250f3363bb3eaf66111d4db 100644
--- a/ProjectSettings/ProjectVersion.txt
+++ b/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2018.1.0b1
+m_EditorVersion: 2018.2.0a8
diff --git a/README.md b/README.md
index 6395ac0ea2791e2d7ef71281ae4a08cfef7e807b..5aefea0bec8545e2c90edcceb59971ca9ef818f3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-> This branch requires **Unity 2018.1**. For older or future versions of Unity please use a matching branch ([master](../..), [5.6](../../tree/5.6), [2017.1](../../tree/2017.1)).
+> ⚠️ The code in this branch is not fully compatible with any publicly-available Unity editor. It addresses changes in the prefab workflow.
 
 # Components for Runtime NavMesh Building