diff --git a/arangod/MMFiles/MMFilesWalRecoverState.cpp b/arangod/MMFiles/MMFilesWalRecoverState.cpp
index 3895ce9015..df1896d3b5 100644
--- a/arangod/MMFiles/MMFilesWalRecoverState.cpp
+++ b/arangod/MMFiles/MMFilesWalRecoverState.cpp
@@ -25,23 +25,23 @@
 #include "ApplicationFeatures/ApplicationServer.h"
 #include "Basics/Exceptions.h"
 #include "Basics/FileUtils.h"
+#include "Basics/Result.h"
+#include "Basics/VelocyPackHelper.h"
 #include "Basics/conversions.h"
 #include "Basics/files.h"
 #include "Basics/memory-map.h"
-#include "Basics/Result.h"
 #include "Basics/tri-strings.h"
-#include "Basics/VelocyPackHelper.h"
-#include "RestServer/DatabaseFeature.h"
 #include "MMFiles/MMFilesCollection.h"
 #include "MMFiles/MMFilesDatafileHelper.h"
 #include "MMFiles/MMFilesLogfileManager.h"
 #include "MMFiles/MMFilesPersistentIndexFeature.h"
 #include "MMFiles/MMFilesWalSlots.h"
+#include "RestServer/DatabaseFeature.h"
 #include "Transaction/Helpers.h"
 #include "Transaction/Hints.h"
+#include "Transaction/StandaloneContext.h"
 #include "Utils/OperationOptions.h"
 #include "Utils/SingleCollectionTransaction.h"
-#include "Transaction/StandaloneContext.h"
 #include "VocBase/LogicalCollection.h"
 #include "VocBase/LogicalView.h"
 
@@ -57,8 +57,9 @@ namespace {
 template <typename T>
 static inline T numericValue(VPackSlice const& slice, char const* attribute) {
   if (!slice.isObject()) {
-    LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "invalid value type when looking for attribute '" << attribute
-             << "': expecting object";
+    LOG_TOPIC(ERR, arangodb::Logger::FIXME)
+        << "invalid value type when looking for attribute '" << attribute
+        << "': expecting object";
     THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER,
                                    "invalid attribute value: expecting object");
   }
@@ -70,11 +71,11 @@ static inline T numericValue(VPackSlice const& slice, char const* attribute) {
     return v.getNumber<T>();
   }
 
-  LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "invalid value for attribute '" << attribute << "'";
+  LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "invalid value for attribute '"
+                                          << attribute << "'";
   THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_BAD_PARAMETER,
                                  "invalid attribute value");
 }
-
 }
 
 /// @brief creates the recover state
@@ -213,8 +214,9 @@ arangodb::LogicalCollection* MMFilesWalRecoverState::useCollection(
     res = TRI_errno();
 
     if (res == TRI_ERROR_ARANGO_CORRUPTED_COLLECTION) {
-      LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "unable to open collection " << collectionId
-                << ". Please check the logs above for errors.";
+      LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+          << "unable to open collection " << collectionId
+          << ". Please check the logs above for errors.";
     }
 
     return nullptr;
@@ -239,7 +241,8 @@ LogicalCollection* MMFilesWalRecoverState::getCollection(
   TRI_vocbase_t* vocbase = useDatabase(databaseId);
 
   if (vocbase == nullptr) {
-    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "database " << databaseId << " not found";
+    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "database " << databaseId
+                                              << " not found";
     return nullptr;
   }
 
@@ -248,8 +251,9 @@ LogicalCollection* MMFilesWalRecoverState::getCollection(
       useCollection(vocbase, collectionId, res);
 
   if (collection == nullptr) {
-    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "collection " << collectionId << " of database " << databaseId
-               << " not found";
+    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "collection " << collectionId
+                                              << " of database " << databaseId
+                                              << " not found";
     return nullptr;
   }
   return collection;
@@ -265,7 +269,8 @@ int MMFilesWalRecoverState::executeSingleOperation(
   TRI_vocbase_t* vocbase = useDatabase(databaseId);
 
   if (vocbase == nullptr) {
-    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "database " << databaseId << " not found";
+    LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "database " << databaseId
+                                              << " not found";
     return TRI_ERROR_ARANGO_DATABASE_NOT_FOUND;
   }
 
@@ -292,14 +297,17 @@ int MMFilesWalRecoverState::executeSingleOperation(
   res = TRI_ERROR_INTERNAL;
 
   try {
-    SingleCollectionTransaction trx(arangodb::transaction::StandaloneContext::Create(vocbase), collectionId, AccessMode::Type::WRITE);
+    SingleCollectionTransaction trx(
+        arangodb::transaction::StandaloneContext::Create(vocbase), collectionId,
+        AccessMode::Type::WRITE);
 
     trx.addHint(transaction::Hints::Hint::SINGLE_OPERATION);
     trx.addHint(transaction::Hints::Hint::NO_BEGIN_MARKER);
     trx.addHint(transaction::Hints::Hint::NO_ABORT_MARKER);
     trx.addHint(transaction::Hints::Hint::NO_THROTTLING);
     trx.addHint(transaction::Hints::Hint::LOCK_NEVER);
-    trx.addHint(transaction::Hints::Hint::RECOVERY); // to turn off waitForSync!
+    trx.addHint(
+        transaction::Hints::Hint::RECOVERY);  // to turn off waitForSync!
 
     res = trx.begin();
 
@@ -319,16 +327,19 @@ int MMFilesWalRecoverState::executeSingleOperation(
     // commit the operation
     res = trx.commit();
   } catch (arangodb::basics::Exception const& ex) {
-    LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught exception during recovery of marker type "
-             << TRI_NameMarkerDatafile(marker) << ": " << ex.what();
+    LOG_TOPIC(ERR, arangodb::Logger::FIXME)
+        << "caught exception during recovery of marker type "
+        << TRI_NameMarkerDatafile(marker) << ": " << ex.what();
     res = ex.code();
   } catch (std::exception const& ex) {
-    LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught exception during recovery of marker type "
-             << TRI_NameMarkerDatafile(marker) << ": " << ex.what();
+    LOG_TOPIC(ERR, arangodb::Logger::FIXME)
+        << "caught exception during recovery of marker type "
+        << TRI_NameMarkerDatafile(marker) << ": " << ex.what();
     res = TRI_ERROR_INTERNAL;
   } catch (...) {
-    LOG_TOPIC(ERR, arangodb::Logger::FIXME) << "caught unknown exception during recovery of marker type "
-             << TRI_NameMarkerDatafile(marker);
+    LOG_TOPIC(ERR, arangodb::Logger::FIXME)
+        << "caught unknown exception during recovery of marker type "
+        << TRI_NameMarkerDatafile(marker);
     res = TRI_ERROR_INTERNAL;
   }
 
@@ -414,11 +425,10 @@ bool MMFilesWalRecoverState::InitialScanMarker(MMFilesMarker const* marker,
       state->totalDroppedCollections.emplace(collectionId);
       break;
     }
-    
+
     case TRI_DF_MARKER_VPACK_DROP_VIEW: {
       // note that the view was dropped and doesn't need to be recovered
-      TRI_voc_cid_t const viewId =
-          MMFilesDatafileHelper::ViewId(marker);
+      TRI_voc_cid_t const viewId = MMFilesDatafileHelper::ViewId(marker);
       state->totalDroppedViews.emplace(viewId);
       break;
     }
@@ -440,7 +450,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
       reinterpret_cast<MMFilesWalRecoverState*>(data);
 
 #ifdef ARANGODB_ENABLE_FAILURE_TESTS
-  LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "replaying marker of type " << TRI_NameMarkerDatafile(marker);
+  LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "replaying marker of type "
+                                            << TRI_NameMarkerDatafile(marker);
 #endif
 
   MMFilesMarkerType const type = marker->getType();
@@ -454,8 +465,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         TRI_voc_cid_t const collectionId =
             MMFilesDatafileHelper::CollectionId(marker);
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found prologue marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found prologue marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
         state->resetCollection(databaseId, collectionId);
         return true;
       }
@@ -482,9 +494,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found document marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId
-                   << ", transactionId: " << tid;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found document marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId << ", transactionId: " << tid;
 
         int res = state->executeSingleOperation(
             databaseId, collectionId, marker, datafile->fid(),
@@ -529,9 +541,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         if (res != TRI_ERROR_NO_ERROR && res != TRI_ERROR_ARANGO_CONFLICT &&
             res != TRI_ERROR_ARANGO_DATABASE_NOT_FOUND &&
             res != TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "unable to insert document in collection "
-                    << collectionId << " of database " << databaseId << ": "
-                    << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "unable to insert document in collection " << collectionId
+              << " of database " << databaseId << ": " << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
@@ -558,9 +570,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found remove marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId
-                   << ", transactionId: " << tid;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found remove marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId << ", transactionId: " << tid;
 
         int res = state->executeSingleOperation(
             databaseId, collectionId, marker, datafile->fid(),
@@ -612,9 +624,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
             res != TRI_ERROR_ARANGO_DATABASE_NOT_FOUND &&
             res != TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND &&
             res != TRI_ERROR_ARANGO_DOCUMENT_NOT_FOUND) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "unable to remove document in collection "
-                    << collectionId << " of database " << databaseId << ": "
-                    << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "unable to remove document in collection " << collectionId
+              << " of database " << databaseId << ": " << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
@@ -634,7 +646,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot rename collection: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot rename collection: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
@@ -643,14 +656,16 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found collection rename marker. databaseId: "
-                   << databaseId << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found collection rename marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
@@ -663,15 +678,16 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (collection == nullptr) {
           // if the underlying collection is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open collection " << collectionId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open collection "
+                                                    << collectionId;
           return true;
         }
 
         VPackSlice nameSlice = payloadSlice.get("name");
         if (!nameSlice.isString()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot rename collection " << collectionId
-                    << " in database " << databaseId
-                    << ": name attribute is no string";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot rename collection " << collectionId << " in database "
+              << databaseId << ": name attribute is no string";
           ++state->errorCount;
           return state->canContinue();
         }
@@ -689,9 +705,10 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         int res = vocbase->renameCollection(collection, name, true);
 
         if (res != TRI_ERROR_NO_ERROR) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot rename collection " << collectionId
-                    << " in database " << databaseId << " to '" << name
-                    << "': " << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot rename collection " << collectionId << " in database "
+              << databaseId << " to '" << name
+              << "': " << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
@@ -707,7 +724,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot change properties of collection: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot change properties of collection: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
@@ -716,14 +734,16 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found collection change marker. databaseId: "
-                   << databaseId << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found collection change marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
@@ -732,9 +752,10 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (collection == nullptr) {
           // if the underlying collection is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot change properties of collection "
-                     << collectionId << " in database " << databaseId << ": "
-                     << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+              << "cannot change properties of collection " << collectionId
+              << " in database " << databaseId << ": "
+              << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
           return true;
         }
 
@@ -742,29 +763,29 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         // be
         // dropped later
         bool const forceSync = state->willBeDropped(databaseId, collectionId);
-        arangodb::Result res = collection->updateProperties(payloadSlice, forceSync);
+        arangodb::Result res =
+            collection->updateProperties(payloadSlice, forceSync);
         if (!res.ok()) {
           LOG_TOPIC(WARN, arangodb::Logger::FIXME)
-              << "cannot change properties for collection "
-              << collectionId << " in database " << databaseId << ": "
-              << res.errorMessage();
+              << "cannot change properties for collection " << collectionId
+              << " in database " << databaseId << ": " << res.errorMessage();
           ++state->errorCount;
           return state->canContinue();
         }
 
         break;
       }
-      
+
       case TRI_DF_MARKER_VPACK_CHANGE_VIEW: {
         TRI_voc_tick_t const databaseId =
             MMFilesDatafileHelper::DatabaseId(marker);
-        TRI_voc_cid_t const viewId =
-            MMFilesDatafileHelper::ViewId(marker);
+        TRI_voc_cid_t const viewId = MMFilesDatafileHelper::ViewId(marker);
         VPackSlice const payloadSlice(reinterpret_cast<char const*>(marker) +
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot change properties of view: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot change properties of view: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
@@ -773,24 +794,28 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found view change marker. databaseId: "
-                   << databaseId << ", viewId: " << viewId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found view change marker. databaseId: " << databaseId
+            << ", viewId: " << viewId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
-        std::shared_ptr<arangodb::LogicalView> view = vocbase->lookupView(viewId);
+        std::shared_ptr<arangodb::LogicalView> view =
+            vocbase->lookupView(viewId);
 
         if (view == nullptr) {
           // if the underlying collection is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot change properties of view "
-                     << viewId << " in database " << databaseId << ": "
-                     << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+              << "cannot change properties of view " << viewId
+              << " in database " << databaseId << ": "
+              << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
           return true;
         }
 
@@ -798,12 +823,12 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         // be
         // dropped later
         bool const forceSync = state->willViewBeDropped(databaseId, viewId);
-        arangodb::Result res = view->updateProperties(payloadSlice, forceSync);
+        arangodb::Result res =
+            view->updateProperties(payloadSlice, false, forceSync);
         if (!res.ok()) {
           LOG_TOPIC(WARN, arangodb::Logger::FIXME)
-              << "cannot change properties for view "
-              << viewId << " in database " << databaseId << ": "
-              << res.errorMessage();
+              << "cannot change properties for view " << viewId
+              << " in database " << databaseId << ": " << res.errorMessage();
           ++state->errorCount;
           return state->canContinue();
         }
@@ -820,7 +845,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create index for collection: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create index for collection: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
@@ -831,16 +857,18 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           return true;
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found create index marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found create index marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot create index for collection " << collectionId
-                     << " in database " << databaseId << ": "
-                     << TRI_errno_string(TRI_ERROR_ARANGO_DATABASE_NOT_FOUND);
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+              << "cannot create index for collection " << collectionId
+              << " in database " << databaseId << ": "
+              << TRI_errno_string(TRI_ERROR_ARANGO_DATABASE_NOT_FOUND);
           return true;
         }
 
@@ -849,28 +877,31 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (col == nullptr) {
           // if the underlying collection gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot create index for collection " << collectionId
-                     << " in database " << databaseId << ": "
-                     << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+              << "cannot create index for collection " << collectionId
+              << " in database " << databaseId << ": "
+              << TRI_errno_string(TRI_ERROR_ARANGO_COLLECTION_NOT_FOUND);
           return true;
         }
 
         auto physical = static_cast<MMFilesCollection*>(col->getPhysical());
         TRI_ASSERT(physical != nullptr);
-        MMFilesPersistentIndexFeature::dropIndex(databaseId, collectionId, indexId);
+        MMFilesPersistentIndexFeature::dropIndex(databaseId, collectionId,
+                                                 indexId);
 
         std::string const indexName("index-" + std::to_string(indexId) +
                                     ".json");
-        std::string const filename(
-            arangodb::basics::FileUtils::buildFilename(physical->path(), indexName));
+        std::string const filename(arangodb::basics::FileUtils::buildFilename(
+            physical->path(), indexName));
 
         bool const forceSync = state->willBeDropped(databaseId, collectionId);
         bool ok = arangodb::basics::VelocyPackHelper::velocyPackToFile(
             filename, payloadSlice, forceSync);
 
         if (!ok) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create index " << indexId << ", collection "
-                    << collectionId << " in database " << databaseId;
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create index " << indexId << ", collection "
+              << collectionId << " in database " << databaseId;
           ++state->errorCount;
           return state->canContinue();
         } else {
@@ -881,8 +912,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
           int res = physical->restoreIndex(&trx, payloadSlice, unused);
 
           if (res != TRI_ERROR_NO_ERROR) {
-            LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create index " << indexId << ", collection "
-                      << collectionId << " in database " << databaseId;
+            LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+                << "cannot create index " << indexId << ", collection "
+                << collectionId << " in database " << databaseId;
             ++state->errorCount;
             return state->canContinue();
           }
@@ -900,13 +932,15 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create collection: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create collection: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found create collection marker. databaseId: "
-                   << databaseId << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found create collection marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
 
         // remove the drop marker
         state->droppedCollections.erase(collectionId);
@@ -919,7 +953,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
@@ -954,9 +989,10 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
             vocbase->dropCollection(collection, true);
           }
         } else {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "empty name attribute in create collection marker for "
-                       "collection "
-                    << collectionId << " and database " << databaseId;
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "empty name attribute in create collection marker for "
+                 "collection "
+              << collectionId << " and database " << databaseId;
           ++state->errorCount;
           return state->canContinue();
         }
@@ -982,13 +1018,11 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
             // set the sync properties to false temporarily
             bool oldSync = state->databaseFeature->forceSyncProperties();
             state->databaseFeature->forceSyncProperties(false);
-            collection =
-                vocbase->createCollection(b2.slice(), collectionId);
+            collection = vocbase->createCollection(b2.slice(), collectionId);
             state->databaseFeature->forceSyncProperties(oldSync);
           } else {
             // collection will be kept
-            collection =
-                vocbase->createCollection(b2.slice(), collectionId);
+            collection = vocbase->createCollection(b2.slice(), collectionId);
           }
           TRI_ASSERT(collection != nullptr);
         } catch (basics::Exception const& ex) {
@@ -998,31 +1032,32 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         }
 
         if (res != TRI_ERROR_NO_ERROR) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create collection " << collectionId
-                    << " in database " << databaseId << ": "
-                    << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create collection " << collectionId << " in database "
+              << databaseId << ": " << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
         break;
       }
-      
+
       case TRI_DF_MARKER_VPACK_CREATE_VIEW: {
         TRI_voc_tick_t const databaseId =
             MMFilesDatafileHelper::DatabaseId(marker);
-        TRI_voc_cid_t const viewId =
-            MMFilesDatafileHelper::ViewId(marker);
+        TRI_voc_cid_t const viewId = MMFilesDatafileHelper::ViewId(marker);
         VPackSlice const payloadSlice(reinterpret_cast<char const*>(marker) +
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create view: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create view: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found create view marker. databaseId: "
-                   << databaseId << ", viewId: " << viewId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found create view marker. databaseId: " << databaseId
+            << ", viewId: " << viewId;
 
         // remove the drop marker
         state->droppedViews.erase(viewId);
@@ -1035,11 +1070,13 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
-        std::shared_ptr<arangodb::LogicalView> view = vocbase->lookupView(viewId);
+        std::shared_ptr<arangodb::LogicalView> view =
+            vocbase->lookupView(viewId);
 
         if (view != nullptr) {
           // drop an existing view
@@ -1059,9 +1096,10 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
             vocbase->dropView(view);
           }
         } else {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "empty name attribute in create view marker for "
-                       "view "
-                    << viewId << " and database " << databaseId;
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "empty name attribute in create view marker for "
+                 "view "
+              << viewId << " and database " << databaseId;
           ++state->errorCount;
           return state->canContinue();
         }
@@ -1074,13 +1112,11 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
             // set the sync properties to false temporarily
             bool oldSync = state->databaseFeature->forceSyncProperties();
             state->databaseFeature->forceSyncProperties(false);
-            view =
-                vocbase->createView(payloadSlice, viewId);
+            view = vocbase->createView(payloadSlice, viewId);
             state->databaseFeature->forceSyncProperties(oldSync);
           } else {
             // view will be kept
-            view =
-                vocbase->createView(payloadSlice, viewId);
+            view = vocbase->createView(payloadSlice, viewId);
           }
           TRI_ASSERT(view != nullptr);
         } catch (basics::Exception const& ex) {
@@ -1090,9 +1126,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         }
 
         if (res != TRI_ERROR_NO_ERROR) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create view " << viewId
-                    << " in database " << databaseId << ": "
-                    << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create view " << viewId << " in database "
+              << databaseId << ": " << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
@@ -1106,13 +1142,14 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create database: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot create database: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found create database marker. databaseId: "
-                   << databaseId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found create database marker. databaseId: " << databaseId;
 
         // remove the drop marker
         state->droppedDatabases.erase(databaseId);
@@ -1127,8 +1164,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         VPackSlice const nameSlice = payloadSlice.get("name");
 
         if (!nameSlice.isString()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot unpack database properties for database "
-                    << databaseId;
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot unpack database properties for database "
+              << databaseId;
           ++state->errorCount;
           return state->canContinue();
         }
@@ -1157,8 +1195,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                                          vocbase);
 
         if (res != TRI_ERROR_NO_ERROR) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create database " << databaseId << ": "
-                    << TRI_errno_string(res);
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot create database "
+                                                   << databaseId << ": "
+                                                   << TRI_errno_string(res);
           ++state->errorCount;
           return state->canContinue();
         }
@@ -1175,16 +1214,17 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
                                       MMFilesDatafileHelper::VPackOffset(type));
 
         if (!payloadSlice.isObject()) {
-          LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot drop index for collection: invalid marker";
+          LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+              << "cannot drop index for collection: invalid marker";
           ++state->errorCount;
           return state->canContinue();
         }
 
         TRI_idx_iid_t indexId = numericValue<TRI_idx_iid_t>(payloadSlice, "id");
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found drop index marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId
-                   << ", indexId: " << indexId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found drop index marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId << ", indexId: " << indexId;
 
         if (state->isDropped(databaseId, collectionId)) {
           return true;
@@ -1194,7 +1234,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
         if (vocbase == nullptr) {
           // if the underlying database is gone, we can go on
-          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database " << databaseId;
+          LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "cannot open database "
+                                                    << databaseId;
           return true;
         }
 
@@ -1211,13 +1252,14 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         TRI_ASSERT(physical != nullptr);
         col->dropIndex(indexId);
 
-        MMFilesPersistentIndexFeature::dropIndex(databaseId, collectionId, indexId);
+        MMFilesPersistentIndexFeature::dropIndex(databaseId, collectionId,
+                                                 indexId);
 
         // additionally remove the index file
         std::string const indexName("index-" + std::to_string(indexId) +
                                     ".json");
-        std::string const filename(
-            arangodb::basics::FileUtils::buildFilename(physical->path(), indexName));
+        std::string const filename(arangodb::basics::FileUtils::buildFilename(
+            physical->path(), indexName));
 
         TRI_UnlinkFile(filename.c_str());
         break;
@@ -1232,8 +1274,9 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         // insert the drop marker
         state->droppedCollections.emplace(collectionId);
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found drop collection marker. databaseId: " << databaseId
-                   << ", collectionId: " << collectionId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found drop collection marker. databaseId: " << databaseId
+            << ", collectionId: " << collectionId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
@@ -1256,18 +1299,18 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         MMFilesPersistentIndexFeature::dropCollection(databaseId, collectionId);
         break;
       }
-      
+
       case TRI_DF_MARKER_VPACK_DROP_VIEW: {
         TRI_voc_tick_t const databaseId =
             MMFilesDatafileHelper::DatabaseId(marker);
-        TRI_voc_cid_t const viewId =
-            MMFilesDatafileHelper::ViewId(marker);
+        TRI_voc_cid_t const viewId = MMFilesDatafileHelper::ViewId(marker);
 
         // insert the drop marker
         state->droppedViews.emplace(viewId);
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found drop view marker. databaseId: " << databaseId
-                   << ", viewId: " << viewId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found drop view marker. databaseId: " << databaseId
+            << ", viewId: " << viewId;
 
         TRI_vocbase_t* vocbase = state->useDatabase(databaseId);
 
@@ -1277,7 +1320,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         }
 
         // ignore any potential error returned by this call
-        std::shared_ptr<arangodb::LogicalView> view = vocbase->lookupView(viewId);
+        std::shared_ptr<arangodb::LogicalView> view =
+            vocbase->lookupView(viewId);
 
         if (view != nullptr) {
           vocbase->dropView(view);
@@ -1292,7 +1336,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
         // insert the drop marker
         state->droppedDatabases.emplace(databaseId);
 
-        LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "found drop database marker. databaseId: " << databaseId;
+        LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+            << "found drop database marker. databaseId: " << databaseId;
 
         TRI_vocbase_t* vocbase = state->releaseDatabase(databaseId);
 
@@ -1320,7 +1365,8 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 
     return true;
   } catch (std::exception const& ex) {
-    LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot replay marker: " << ex.what();
+    LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "cannot replay marker: "
+                                             << ex.what();
     ++state->errorCount;
     return state->canContinue();
   } catch (...) {
@@ -1331,13 +1377,15 @@ bool MMFilesWalRecoverState::ReplayMarker(MMFilesMarker const* marker,
 }
 
 /// @brief replay a single logfile
-int MMFilesWalRecoverState::replayLogfile(MMFilesWalLogfile* logfile, int number) {
+int MMFilesWalRecoverState::replayLogfile(MMFilesWalLogfile* logfile,
+                                          int number) {
   std::string const logfileName = logfile->filename();
 
   int const n = static_cast<int>(logfilesToProcess.size());
 
-  LOG_TOPIC(INFO, arangodb::Logger::FIXME) << "replaying WAL logfile '" << logfileName << "' (" << (number + 1)
-            << " of " << n << ")";
+  LOG_TOPIC(INFO, arangodb::Logger::FIXME)
+      << "replaying WAL logfile '" << logfileName << "' (" << (number + 1)
+      << " of " << n << ")";
 
   MMFilesDatafile* df = logfile->df();
 
@@ -1347,8 +1395,9 @@ int MMFilesWalRecoverState::replayLogfile(MMFilesWalLogfile* logfile, int number
 
   if (!TRI_IterateDatafile(df, &MMFilesWalRecoverState::ReplayMarker,
                            static_cast<void*>(this))) {
-    LOG_TOPIC(WARN, arangodb::Logger::FIXME) << "WAL inspection failed when scanning logfile '" << logfileName
-              << "'";
+    LOG_TOPIC(WARN, arangodb::Logger::FIXME)
+        << "WAL inspection failed when scanning logfile '" << logfileName
+        << "'";
     return TRI_ERROR_ARANGO_RECOVERY;
   }
 
@@ -1383,7 +1432,8 @@ int MMFilesWalRecoverState::abortOpenTransactions() {
     return TRI_ERROR_NO_ERROR;
   }
 
-  LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "writing abort markers for still open transactions";
+  LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+      << "writing abort markers for still open transactions";
   int res = TRI_ERROR_NO_ERROR;
 
   VPackBuilder builder;
@@ -1434,7 +1484,8 @@ int MMFilesWalRecoverState::removeEmptyLogfiles() {
     auto filename = (*it);
 
     if (basics::FileUtils::remove(filename, 0)) {
-      LOG_TOPIC(TRACE, arangodb::Logger::FIXME) << "removing empty WAL logfile '" << filename << "'";
+      LOG_TOPIC(TRACE, arangodb::Logger::FIXME)
+          << "removing empty WAL logfile '" << filename << "'";
     }
   }
 
diff --git a/arangod/RestHandler/RestViewHandler.cpp b/arangod/RestHandler/RestViewHandler.cpp
index 649617fd5b..d62b5a04fe 100644
--- a/arangod/RestHandler/RestViewHandler.cpp
+++ b/arangod/RestHandler/RestViewHandler.cpp
@@ -48,12 +48,12 @@ RestStatus RestViewHandler::execute() {
   }
 
   if (type == rest::RequestType::PUT) {
-    modifyView();
+    modifyView(false);
     return RestStatus::DONE;
   }
 
   if (type == rest::RequestType::PATCH) {
-    modifyView();
+    modifyView(true);
     return RestStatus::DONE;
   }
 
@@ -135,7 +135,7 @@ void RestViewHandler::createView() {
 /// @brief was docuBlock JSF_post_api_cursor_identifier
 ////////////////////////////////////////////////////////////////////////////////
 
-void RestViewHandler::modifyView() {
+void RestViewHandler::modifyView(bool partialUpdate) {
   if (_request->payload().isEmptyObject()) {
     generateError(rest::ResponseCode::BAD, TRI_ERROR_HTTP_CORRUPTED_JSON);
     return;
@@ -167,7 +167,8 @@ void RestViewHandler::modifyView() {
     }
     VPackSlice body = parsedBody.get()->slice();
 
-    auto result = view->updateProperties(body, true);  // TODO: not force sync?
+    auto result = view->updateProperties(body, partialUpdate,
+                                         true);  // TODO: not force sync?
     if (result.ok()) {
       VPackBuilder updated;
       updated.openObject();
diff --git a/arangod/RestHandler/RestViewHandler.h b/arangod/RestHandler/RestViewHandler.h
index 11d706d336..3b4e3b32d5 100644
--- a/arangod/RestHandler/RestViewHandler.h
+++ b/arangod/RestHandler/RestViewHandler.h
@@ -44,7 +44,7 @@ class RestViewHandler : public RestVocbaseBaseHandler {
 
  protected:
   void createView();
-  void modifyView();
+  void modifyView(bool partialUpdate);
   void deleteView();
   void getViews();
 
diff --git a/arangod/V8Server/v8-views.cpp b/arangod/V8Server/v8-views.cpp
index 785e007bee..69e0d5f5cb 100644
--- a/arangod/V8Server/v8-views.cpp
+++ b/arangod/V8Server/v8-views.cpp
@@ -237,8 +237,7 @@ static void JS_DropViewVocbase(
 
   int res = vocbase->dropView(name);
 
-  if (res != TRI_ERROR_NO_ERROR &&
-      res != TRI_ERROR_ARANGO_VIEW_NOT_FOUND) {
+  if (res != TRI_ERROR_NO_ERROR && res != TRI_ERROR_ARANGO_VIEW_NOT_FOUND) {
     TRI_V8_THROW_EXCEPTION(res);
   }
 
@@ -422,7 +421,7 @@ static void JS_PropertiesViewVocbase(
           application_features::ApplicationServer::getFeature<DatabaseFeature>(
               "Database")
               ->forceSyncProperties();
-      arangodb::Result updateRes = view->updateProperties(slice, doSync);
+      arangodb::Result updateRes = view->updateProperties(slice, true, doSync);
 
       if (!updateRes.ok()) {
         TRI_V8_THROW_EXCEPTION_MESSAGE(updateRes.errorNumber(),
diff --git a/arangod/Views/LoggerView.cpp b/arangod/Views/LoggerView.cpp
index 3525d8a73f..a9451805e0 100644
--- a/arangod/Views/LoggerView.cpp
+++ b/arangod/Views/LoggerView.cpp
@@ -72,18 +72,17 @@ static std::string LevelEnumToString(LogLevel level) {
 std::string LoggerView::type("logger");
 
 std::unique_ptr<ViewImplementation> LoggerView::creator(
-    LogicalView* view, arangodb::velocypack::Slice const& info,
-    bool isNew) {
-  LOG_TOPIC(INFO, Logger::FIXME) << "called LoggerView::creator with data: " << info.toJson() << ", isNew: " << isNew;
+    LogicalView* view, arangodb::velocypack::Slice const& info, bool isNew) {
+  LOG_TOPIC(INFO, Logger::FIXME)
+      << "called LoggerView::creator with data: " << info.toJson()
+      << ", isNew: " << isNew;
 
   return std::make_unique<LoggerView>(ConstructionGuard(), view, info, isNew);
 }
 
 LoggerView::LoggerView(ConstructionGuard const&, LogicalView* logical,
-                       arangodb::velocypack::Slice const& info,
-                       bool isNew)
+                       arangodb::velocypack::Slice const& info, bool isNew)
     : ViewImplementation(logical, info) {
-  
   VPackSlice properties = info.get("properties");
   if (!properties.isObject()) {
     _level = LogLevel::TRACE;
@@ -101,9 +100,11 @@ LoggerView::LoggerView(ConstructionGuard const&, LogicalView* logical,
 }
 
 arangodb::Result LoggerView::updateProperties(
-    arangodb::velocypack::Slice const& slice, bool doSync) {
-  LOG_TOPIC(INFO, Logger::FIXME) << "called LoggerView::updateProperties with data " << slice.toJson()
-                                 << ". view data: " << _logicalView->toVelocyPack(true, false).slice().toJson();
+    arangodb::velocypack::Slice const& slice, bool partialUpdate, bool doSync) {
+  LOG_TOPIC(INFO, Logger::FIXME)
+      << "called LoggerView::updateProperties with data " << slice.toJson()
+      << ". view data: "
+      << _logicalView->toVelocyPack(true, false).slice().toJson();
 
   VPackSlice levelSlice = slice.get("level");
   if (!levelSlice.isString()) {
@@ -128,9 +129,13 @@ void LoggerView::getPropertiesVPack(velocypack::Builder& builder) const {
 
 /// @brief opens an existing view
 void LoggerView::open() {
-  LOG_TOPIC(INFO, Logger::FIXME) << "called LoggerView::open. view data: " << _logicalView->toVelocyPack(true, false).slice().toJson();
+  LOG_TOPIC(INFO, Logger::FIXME)
+      << "called LoggerView::open. view data: "
+      << _logicalView->toVelocyPack(true, false).slice().toJson();
 }
 
 void LoggerView::drop() {
-  LOG_TOPIC(INFO, Logger::FIXME) << "called LoggerView::drop. view data: " << _logicalView->toVelocyPack(true, false).slice().toJson();
+  LOG_TOPIC(INFO, Logger::FIXME)
+      << "called LoggerView::drop. view data: "
+      << _logicalView->toVelocyPack(true, false).slice().toJson();
 }
diff --git a/arangod/Views/LoggerView.h b/arangod/Views/LoggerView.h
index 97b9b113fd..dbe5a0a4b8 100644
--- a/arangod/Views/LoggerView.h
+++ b/arangod/Views/LoggerView.h
@@ -40,8 +40,7 @@ class LoggerView final : public ViewImplementation {
  public:
   static std::string type;
   static std::unique_ptr<ViewImplementation> creator(
-      LogicalView*, arangodb::velocypack::Slice const& info,
-      bool isNew);
+      LogicalView*, arangodb::velocypack::Slice const& info, bool isNew);
 
  private:
   // private struct that does not do anything
@@ -52,13 +51,12 @@ class LoggerView final : public ViewImplementation {
 
  public:
   LoggerView(ConstructionGuard const&, LogicalView* logical,
-             arangodb::velocypack::Slice const& info,
-             bool isNew);
+             arangodb::velocypack::Slice const& info, bool isNew);
 
   ~LoggerView() = default;
 
   arangodb::Result updateProperties(arangodb::velocypack::Slice const& slice,
-                                    bool doSync) override;
+                                    bool partialUpdate, bool doSync) override;
 
   /// @brief export properties
   void getPropertiesVPack(velocypack::Builder&) const override;
diff --git a/arangod/VocBase/LogicalView.cpp b/arangod/VocBase/LogicalView.cpp
index 9b91e852e9..38e5a0c2f0 100644
--- a/arangod/VocBase/LogicalView.cpp
+++ b/arangod/VocBase/LogicalView.cpp
@@ -189,13 +189,14 @@ void LogicalView::drop() {
   }
 
   TRI_ASSERT(!ServerState::instance()->isCoordinator());
-  //StorageEngine* engine = EngineSelectorFeature::ENGINE;
-  //engine->destroyView(_vocbase, this);
+  // StorageEngine* engine = EngineSelectorFeature::ENGINE;
+  // engine->destroyView(_vocbase, this);
 
   _physical->drop();
 }
 
-VPackBuilder LogicalView::toVelocyPack(bool includeProperties, bool includeSystem) const {
+VPackBuilder LogicalView::toVelocyPack(bool includeProperties,
+                                       bool includeSystem) const {
   VPackBuilder builder;
   builder.openObject();
   toVelocyPack(builder, includeProperties, includeSystem);
@@ -232,6 +233,7 @@ void LogicalView::toVelocyPack(VPackBuilder& result, bool includeProperties,
 }
 
 arangodb::Result LogicalView::updateProperties(VPackSlice const& slice,
+                                               bool partialUpdate,
                                                bool doSync) {
   WRITE_LOCKER(writeLocker, _infoLock);
 
@@ -239,7 +241,7 @@ arangodb::Result LogicalView::updateProperties(VPackSlice const& slice,
 
   // the implementation may filter/change/react to the changes
   arangodb::Result implResult =
-      getImplementation()->updateProperties(slice, doSync);
+      getImplementation()->updateProperties(slice, partialUpdate, doSync);
 
   if (implResult.ok()) {
     // after this call the properties are stored
@@ -266,6 +268,7 @@ void LogicalView::persistPhysicalView() {
 }
 
 void LogicalView::spawnImplementation(
-    ViewCreator creator, arangodb::velocypack::Slice const& parameters, bool isNew) {
+    ViewCreator creator, arangodb::velocypack::Slice const& parameters,
+    bool isNew) {
   _implementation = creator(this, parameters, isNew);
 }
diff --git a/arangod/VocBase/LogicalView.h b/arangod/VocBase/LogicalView.h
index 03d96046fd..e7dfe92cc0 100644
--- a/arangod/VocBase/LogicalView.h
+++ b/arangod/VocBase/LogicalView.h
@@ -80,7 +80,8 @@ class LogicalView {
   void drop();
 
   // SECTION: Serialization
-  VPackBuilder toVelocyPack(bool includeProperties = false, bool includeSystem = false) const;
+  VPackBuilder toVelocyPack(bool includeProperties = false,
+                            bool includeSystem = false) const;
 
   void toVelocyPack(velocypack::Builder&, bool includeProperties = false,
                     bool includeSystem = false) const;
@@ -88,7 +89,7 @@ class LogicalView {
   inline TRI_vocbase_t* vocbase() const { return _vocbase; }
 
   // Update this view.
-  arangodb::Result updateProperties(velocypack::Slice const&, bool);
+  arangodb::Result updateProperties(velocypack::Slice const&, bool, bool);
 
   /// @brief Persist the connected physical view.
   ///        This should be called AFTER the view is successfully
diff --git a/arangod/VocBase/ViewImplementation.h b/arangod/VocBase/ViewImplementation.h
index 4ddc477f19..43a2af1b1d 100644
--- a/arangod/VocBase/ViewImplementation.h
+++ b/arangod/VocBase/ViewImplementation.h
@@ -47,7 +47,8 @@ class ViewImplementation {
 
   /// @brief called when a view's properties are updated
   virtual arangodb::Result updateProperties(
-      arangodb::velocypack::Slice const& slice, bool doSync) = 0;
+      arangodb::velocypack::Slice const& slice, bool partialUpdate,
+      bool doSync) = 0;
 
   /// @brief callend when a view's properties are materialized into
   /// the VelocyPack Builder passed into the method. the implementation
@@ -68,7 +69,7 @@ class ViewImplementation {
 };
 
 /// @brief typedef for a ViewImplementation creator function
-/// this typedef is used when registering the creator function for 
+/// this typedef is used when registering the creator function for
 /// any view type. the creator function is called when a view is first
 /// created or re-opened after a server restart.
 /// the VelocyPack Slice will contain all information about the
@@ -76,8 +77,7 @@ class ViewImplementation {
 /// flag will be true if the view is first created, and false if a
 /// view is re-opened on a server restart.
 typedef std::function<std::unique_ptr<ViewImplementation>(
-    LogicalView*, arangodb::velocypack::Slice const&,
-    bool isNew)>
+    LogicalView*, arangodb::velocypack::Slice const&, bool isNew)>
     ViewCreator;
 
 }  // namespace arangodb
diff --git a/js/client/modules/@arangodb/arango-view.js b/js/client/modules/@arangodb/arango-view.js
index 9b82e6c94c..fa8135897a 100644
--- a/js/client/modules/@arangodb/arango-view.js
+++ b/js/client/modules/@arangodb/arango-view.js
@@ -186,7 +186,7 @@ ArangoView.prototype.properties = function (properties) {
     arangosh.checkRequestResult(requestResult);
   } else {
     var body = properties;
-    requestResult = this._database._connection.PUT(this._baseurl('properties'),
+    requestResult = this._database._connection.PATCH(this._baseurl('properties'),
       JSON.stringify(body));
 
     arangosh.checkRequestResult(requestResult);