diff --git a/Documentation/Books/AQL/book.json b/Documentation/Books/AQL/book.json
index 0333559cf5..931061e3e6 100644
--- a/Documentation/Books/AQL/book.json
+++ b/Documentation/Books/AQL/book.json
@@ -1,10 +1,10 @@
 {
-  "gitbook": ">=2.0.0",
+  "gitbook": ">=2.6.0",
   "title": "ArangoDB VERSION_NUMBER AQL Documentation",
   "author": "ArangoDB GmbH",
   "description": "Official AQL manual for ArangoDB - the multi-model NoSQL database",
   "language": "en",
-  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
+  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
   "pdf": {
     "fontSize": 12,
     "toc": true,
@@ -25,6 +25,10 @@
     },
     "add-header": {
         "BASE_PATH": "https://docs.arangodb.com/devel"
+    },
+    "piwik": {
+        "URL": "www.arangodb.com/piwik/",
+        "siteId": 12
     }
   }
 }
diff --git a/Documentation/Books/HTTP/book.json b/Documentation/Books/HTTP/book.json
index 90466c2b26..29d5e10fbd 100644
--- a/Documentation/Books/HTTP/book.json
+++ b/Documentation/Books/HTTP/book.json
@@ -4,7 +4,7 @@
   "author": "ArangoDB GmbH",
   "description": "Official HTTP API manual for ArangoDB - the multi-model NoSQL database",
   "language": "en",
-  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
+  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
   "pdf": {
     "fontSize": 12,
     "toc": true,
@@ -25,6 +25,10 @@
     },
     "add-header": {
         "BASE_PATH": "https://docs.arangodb.com/devel"
+    },
+    "piwik": {
+        "URL": "www.arangodb.com/piwik/",
+        "siteId": 12
     }
   }
 }
diff --git a/Documentation/Books/Manual/book.json b/Documentation/Books/Manual/book.json
index c31b914e0c..5827213375 100644
--- a/Documentation/Books/Manual/book.json
+++ b/Documentation/Books/Manual/book.json
@@ -4,7 +4,7 @@
   "author": "ArangoDB GmbH",
   "description": "Official manual for ArangoDB - the multi-model NoSQL database",
   "language": "en",
-  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header"],
+  "plugins":["-search", "-sharing", "toggle-chapters", "addcssjs", "heading-anchors", "add-header", "piwik"],
   "pdf": {
     "fontSize": 12,
     "toc": true,
@@ -25,6 +25,10 @@
     },
     "add-header": {
         "BASE_PATH": "https://docs.arangodb.com/devel"
+    },
+    "piwik": {
+        "URL": "www.arangodb.com/piwik/",
+        "siteId": 12
     }
   }
 }
diff --git a/Installation/Windows/Templates/NSIS.template.in b/Installation/Windows/Templates/NSIS.template.in
index 085dc0448e..231495db01 100755
--- a/Installation/Windows/Templates/NSIS.template.in
+++ b/Installation/Windows/Templates/NSIS.template.in
@@ -1,9 +1,9 @@
 ; CPack install script designed for a nmake build
-!addplugindir  '@CPACK_PLUGIN_PATH@\Plugins\NSIS_Simple_Service_Plugin_1.30'
-!addplugindir  '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS\Ansi'
-!addplugindir  '@CPACK_PLUGIN_PATH@\Plugins\AccessControl\Plugins'
-!addplugindir  '@CPACK_PLUGIN_PATH@\Plugins\SharedMemory\Plugins'
-!addincludedir '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS'
+!addplugindir  '@CPACK_PLUGIN_PATH@/NSIS_Simple_Service_Plugin_1.30'
+!addplugindir  '@CPACK_PLUGIN_PATH@/UAC-plug-in-NSIS/Ansi'
+!addplugindir  '@CPACK_PLUGIN_PATH@/AccessControl/Plugins'
+!addplugindir  '@CPACK_PLUGIN_PATH@/SharedMemory/Plugins'
+!addincludedir '@CPACK_PLUGIN_PATH@/UAC-plug-in-NSIS'
 
 ;--------------------------------
 ; Include LogicLib for more readable code
diff --git a/arangod/Aql/Executor.cpp b/arangod/Aql/Executor.cpp
index 241965e2ca..157bc7dafd 100644
--- a/arangod/Aql/Executor.cpp
+++ b/arangod/Aql/Executor.cpp
@@ -1464,10 +1464,6 @@ void Executor::generateCodeNode(AstNode const* node) {
 arangodb::basics::StringBuffer* Executor::initializeBuffer() {
   if (_buffer == nullptr) {
     _buffer = new arangodb::basics::StringBuffer(TRI_UNKNOWN_MEM_ZONE, 512, false);
-
-    if (_buffer == nullptr) {
-      THROW_ARANGO_EXCEPTION(TRI_ERROR_OUT_OF_MEMORY);
-    }
   } else {
     _buffer->clear();
   }
diff --git a/arangod/Cluster/ClusterComm.cpp b/arangod/Cluster/ClusterComm.cpp
index da00f9222c..2cb8f46b02 100644
--- a/arangod/Cluster/ClusterComm.cpp
+++ b/arangod/Cluster/ClusterComm.cpp
@@ -171,11 +171,6 @@ void ClusterComm::cleanup() {
 void ClusterComm::startBackgroundThread() {
   _backgroundThread = new ClusterCommThread();
 
-  if (nullptr == _backgroundThread) {
-    LOG(FATAL) << "unable to start ClusterComm background thread";
-    FATAL_ERROR_EXIT();
-  }
-
   if (!_backgroundThread->start()) {
     LOG(FATAL) << "ClusterComm background thread does not work";
     FATAL_ERROR_EXIT();
diff --git a/arangod/HttpServer/HttpCommTask.cpp b/arangod/HttpServer/HttpCommTask.cpp
index c4323ba5f7..624cbaed11 100644
--- a/arangod/HttpServer/HttpCommTask.cpp
+++ b/arangod/HttpServer/HttpCommTask.cpp
@@ -1042,8 +1042,6 @@ void HttpCommTask::signalTask(TaskData* data) {
     } else {
       StringBuffer* buffer = new StringBuffer(TRI_UNKNOWN_MEM_ZONE, len);
 
-      TRI_ASSERT(buffer != nullptr);
-
       buffer->appendHex(len);
       buffer->appendText(TRI_CHAR_LENGTH_PAIR("\r\n"));
       buffer->appendText(data->_data.c_str(), len);
diff --git a/arangod/HttpServer/HttpHandlerFactory.cpp b/arangod/HttpServer/HttpHandlerFactory.cpp
index f606fe8925..9085fbc587 100644
--- a/arangod/HttpServer/HttpHandlerFactory.cpp
+++ b/arangod/HttpServer/HttpHandlerFactory.cpp
@@ -143,9 +143,7 @@ HttpRequest* HttpHandlerFactory::createRequest(ConnectionInfo const& info,
                                                char const* ptr, size_t length) {
   HttpRequest* request = new HttpRequest(info, ptr, length, _allowMethodOverride);
 
-  if (request != nullptr) {
-    setRequestContext(request);
-  }
+  setRequestContext(request);
 
   return request;
 }
diff --git a/arangod/Replication/Syncer.cpp b/arangod/Replication/Syncer.cpp
index f386131fee..40385e7e0a 100644
--- a/arangod/Replication/Syncer.cpp
+++ b/arangod/Replication/Syncer.cpp
@@ -95,21 +95,19 @@ Syncer::Syncer(TRI_vocbase_t* vocbase,
       _client = new SimpleHttpClient(_connection,
                                      _configuration._requestTimeout, false);
 
-      if (_client != nullptr) {
-        std::string username = _configuration._username;
-        std::string password = _configuration._password;
+      std::string username = _configuration._username;
+      std::string password = _configuration._password;
 
-        _client->setUserNamePassword("/", username, password);
-        _client->setLocationRewriter(this, &rewriteLocation);
+      _client->setUserNamePassword("/", username, password);
+      _client->setLocationRewriter(this, &rewriteLocation);
 
-        _client->_maxRetries = 2;
-        _client->_retryWaitTime = 2 * 1000 * 1000;
-        _client->_retryMessage =
-            std::string("retrying failed HTTP request for endpoint '") +
-            _configuration._endpoint +
-            std::string("' for replication applier in database '" +
-                        std::string(_vocbase->_name) + "'");
-      }
+      _client->_maxRetries = 2;
+      _client->_retryWaitTime = 2 * 1000 * 1000;
+      _client->_retryMessage =
+          std::string("retrying failed HTTP request for endpoint '") +
+          _configuration._endpoint +
+          std::string("' for replication applier in database '" +
+                      std::string(_vocbase->_name) + "'");
     }
   }
 }
diff --git a/arangod/V8Server/V8DealerFeature.cpp b/arangod/V8Server/V8DealerFeature.cpp
index 54d2120266..05dbb2e7ec 100644
--- a/arangod/V8Server/V8DealerFeature.cpp
+++ b/arangod/V8Server/V8DealerFeature.cpp
@@ -861,11 +861,6 @@ void V8DealerFeature::initializeContext(size_t i) {
 
   V8Context* context = _contexts[i] = new V8Context();
 
-  if (context == nullptr) {
-    LOG(FATAL) << "cannot initialize V8 context #" << i;
-    FATAL_ERROR_EXIT();
-  }
-
   TRI_ASSERT(context->_locker == nullptr);
 
   // enter a new isolate