diff --git a/Entitas/Entitas/version.txt b/Entitas/Entitas/version.txt
index dc1e644a1..9c6d6293b 100644
--- a/Entitas/Entitas/version.txt
+++ b/Entitas/Entitas/version.txt
@@ -1 +1 @@
-1.6.0
+1.6.1
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll
index d9f579491..684c07206 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Analytics.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll
index 8e7e3e1ed..023203617 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.Unity.Editor.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.dll
index 5a1ae334a..e5fc845cb 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.CodeGenerator.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Plugins.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Plugins.dll
index 882c83896..881750f05 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Plugins.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Plugins.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins.dll
index eefba718b..e10edd97e 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.Unity.Plugins.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll
index c77d9132a..757cb429a 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.CodeGeneration.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll
index 0fd3322c9..024cdac1c 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Logging.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Networking.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Networking.dll
index d8bf19755..8465e4e57 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Networking.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Networking.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Serialization.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Serialization.dll
index d139395f7..2f7f685b8 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Serialization.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Serialization.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Unity.Editor.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Unity.Editor.dll
index 660a7f23e..3c1cf3297 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Unity.Editor.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Unity.Editor.dll differ
diff --git a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Utils.dll b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Utils.dll
index 627bf6a4c..8f4ddb982 100644
Binary files a/Libraries/Dependencies/DesperateDevs/DesperateDevs.Utils.dll and b/Libraries/Dependencies/DesperateDevs/DesperateDevs.Utils.dll differ
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
index 418c0d740..ab36bbb41 100644
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -1,3 +1,21 @@
+# 1.6.1
+
+As always, the Unity Asset Store version might take a few days to be processed
+and accepted by Unity. Please check for updates in 2 - 4 days here:
+https://www.assetstore.unity3d.com/#!/content/87638
+
+#### Entitas
+🛠 Fixed context.Reset() which doesn't remove event hanlders anymore. Closes #725
+🛠 Updated EntitasStats to exclude JobSystem and Feature
+
+#### Jenny
+🛠 Fixed Jenny dropdown UI to not show 'mixed...' anymore
+⚙️ Added Jenny Server toggle to UI
+⚙️ Added dry run option
+⚠️ Removed EnsureStandalonePreProcessor
+🆕 Added WarnIfCompilationErrorsPreProcessor
+
+
 # 1.6.0
 
 As always, the Unity Asset Store version might take a few days to be processed
diff --git a/Scripts/bee b/Scripts/bee
index 59696f2d9..9f9d15fb0 100755
--- a/Scripts/bee
+++ b/Scripts/bee
@@ -509,7 +509,7 @@ github_create_release() {
 
   pushd "${BUILD_DIST}" > /dev/null
     github_release_attach_zip "${upload_url}" "${PROJECT}.zip"
-    github_release_attach_zip "${upload_url}" "${PROJECT}.docset.tgz"
+#    github_release_attach_zip "${upload_url}" "${PROJECT}.docset.tgz"
   popd > /dev/null
 }
 
diff --git a/Tests/Unity/VisualDebugging/UnityPackageManager/manifest.json b/Tests/Unity/VisualDebugging/Packages/manifest.json
similarity index 100%
rename from Tests/Unity/VisualDebugging/UnityPackageManager/manifest.json
rename to Tests/Unity/VisualDebugging/Packages/manifest.json
diff --git a/Tests/Unity/VisualDebugging/Preferences.properties b/Tests/Unity/VisualDebugging/Preferences.properties
index 8a89ada21..ebe3b4587 100644
--- a/Tests/Unity/VisualDebugging/Preferences.properties
+++ b/Tests/Unity/VisualDebugging/Preferences.properties
@@ -10,7 +10,10 @@ Jenny.Plugins = DesperateDevs.CodeGeneration.Plugins, \
                 Entitas.CodeGeneration.Plugins, \
                 Entitas.VisualDebugging.CodeGeneration.Plugins
 
-Jenny.PreProcessors = DesperateDevs.CodeGeneration.Plugins.TargetFrameworkProfilePreProcessor
+Jenny.PreProcessors = DesperateDevs.CodeGeneration.Plugins.ValidateProjectPathPreProcessor, \
+                      DesperateDevs.CodeGeneration.Plugins.EnsureStandalonePreProcessor, \
+                      DesperateDevs.CodeGeneration.Plugins.TargetFrameworkProfilePreProcessor
+
 Jenny.DataProviders = Entitas.CodeGeneration.Plugins.ComponentDataProvider, \
                       Entitas.CodeGeneration.Plugins.ContextDataProvider, \
                       Entitas.CodeGeneration.Plugins.EntityIndexDataProvider
diff --git a/Tests/Unity/VisualDebugging/ProjectSettings/PresetManager.asset b/Tests/Unity/VisualDebugging/ProjectSettings/PresetManager.asset
new file mode 100644
index 000000000..636a595b3
--- /dev/null
+++ b/Tests/Unity/VisualDebugging/ProjectSettings/PresetManager.asset
@@ -0,0 +1,6 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1386491679 &1
+PresetManager:
+  m_ObjectHideFlags: 0
+  m_DefaultList: []
diff --git a/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt b/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt
index 7a6fffb8b..9788b3ac5 100644
--- a/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt
+++ b/Tests/Unity/VisualDebugging/ProjectSettings/ProjectVersion.txt
@@ -1 +1 @@
-m_EditorVersion: 2017.2.0f3
+m_EditorVersion: 2018.1.1f1
diff --git a/Tests/Unity/VisualDebugging/ProjectSettings/UnityAdsSettings.asset b/Tests/Unity/VisualDebugging/ProjectSettings/UnityAdsSettings.asset
deleted file mode 100644
index e6070fc50..000000000
Binary files a/Tests/Unity/VisualDebugging/ProjectSettings/UnityAdsSettings.asset and /dev/null differ