diff --git a/config/configuration.sample.yml b/config/configuration.sample.yml
index b7fef2618a..f3c61ff9b5 100644
--- a/config/configuration.sample.yml
+++ b/config/configuration.sample.yml
@@ -63,12 +63,6 @@ main:
         mp4box_timeout: 60
         swftools_timeout: 60
         unoconv_timeout: 60
-    task-manager:
-        status: started
-        listener:
-            protocol: tcp
-            host: 127.0.0.1
-            port: 6700
     storage:
         subdefs: null
         cache: null
@@ -76,20 +70,7 @@ main:
         download: null
         lazaret: null
         caption: null
-    bridge:
-        youtube:
-            enabled: false
-            client_id: null
-            client_secret: null
-            developer_key: null
-        flickr:
-            enabled: false
-            client_id: null
-            client_secret: null
-        dailymotion:
-            enabled: false
-            client_id: null
-            client_secret: null
+        tmp_files: null
 border-manager:
     enabled: true
     extension-mapping:
@@ -99,12 +80,17 @@ border-manager:
         -
             type: Checker\Sha256
             enabled: true
+            collections: []
+            compare-ignore-collections: []
         -
             type: Checker\UUID
             enabled: true
+            collections: []
+            compare-ignore-collections: []
         -
             type: Checker\Colorspace
             enabled: false
+            collections: []
             options:
                 colorspaces: [cmyk, grayscale, rgb]
                 media_types: [Image]
@@ -124,6 +110,8 @@ border-manager:
             enabled: false
             options:
                 sensitive: true
+            collections: []
+            compare-ignore-collections: []
         -
             type: Checker\MediaType
             enabled: false
@@ -245,6 +233,14 @@ embed_bundle:
     document:
         player: flexpaper
         enable_pdfjs: true
+video-editor:
+    ChapterVttFieldName: VideoTextTrackChapters
+    seekBackwardStep: 500 # in ms
+    seekForwardStep: 500  # in ms
+    playbackRates:
+        - 1
+        - '1.5'
+        - 3       
 geocoding-providers:
     -
         map-provider: mapboxWebGL
diff --git a/lib/Alchemy/Phrasea/Core/Version.php b/lib/Alchemy/Phrasea/Core/Version.php
index d17062de4c..c029f2be01 100644
--- a/lib/Alchemy/Phrasea/Core/Version.php
+++ b/lib/Alchemy/Phrasea/Core/Version.php
@@ -16,7 +16,8 @@ class Version
     /**
      * @var string
      */
-    private $number = '4.1.0-alpha.22a';
+
+    private $number = '4.1.0-alpha.23a';
 
     /**
      * @var string
diff --git a/lib/classes/patch/410alpha23a.php b/lib/classes/patch/410alpha23a.php
new file mode 100644
index 0000000000..eae272bc8e
--- /dev/null
+++ b/lib/classes/patch/410alpha23a.php
@@ -0,0 +1,111 @@
+<?php
+
+/*
+ * This file is part of Phraseanet
+ *
+ * (c) 2005-2019 Alchemy
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Alchemy\Phrasea\Application;
+
+class patch_410alpha23a implements patchInterface
+{
+    /** @var string */
+    private $release = '4.1.0-alpha.23a';
+
+    /** @var array */
+    private $concern = [base::APPLICATION_BOX];
+
+    /**
+     * Returns the release version.
+     *
+     * @return string
+     */
+    public function get_release()
+    {
+        return $this->release;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function concern()
+    {
+        return $this->concern;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function require_all_upgrades()
+    {
+        return false;
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function getDoctrineMigrations()
+    {
+        return [];
+    }
+
+    /**
+     * {@inheritdoc}
+     */
+    public function apply(base $appbox, Application $app)
+    {
+        // fix embed-bundle keys
+        if ($app['conf']->has(['embed_bundle', 'video', 'available-speeds'])) {
+            $availableSpeed = $app['conf']->get(['embed_bundle', 'video', 'available-speeds']);
+            $app['conf']->remove(['embed_bundle', 'video', 'available-speeds']);
+            $app['conf']->set(['embed_bundle', 'video', 'available_speeds'], $availableSpeed);
+        }
+
+        if ($app['conf']->has(['embed_bundle', 'audio', 'available-speeds'])) {
+            $availableSpeed = $app['conf']->get(['embed_bundle', 'audio', 'available-speeds']);
+            $app['conf']->remove(['embed_bundle', 'audio', 'available-speeds']);
+            $app['conf']->set(['embed_bundle', 'audio', 'available_speeds'], $availableSpeed);
+        }
+
+        if ($app['conf']->has(['embed_bundle', 'document', 'enable-pdfjs'])) {
+            $enablePdfjs = $app['conf']->get(['embed_bundle', 'document', 'enable-pdfjs']);
+            $app['conf']->remove(['embed_bundle', 'document', 'enable-pdfjs']);
+            $app['conf']->set(['embed_bundle', 'document', 'enable_pdfjs'], $enablePdfjs);
+        }
+
+        //  geoloc section change replace 'name' to 'map-provider'
+        if ($app['conf']->has(['geocoding-providers', 0, 'name'])) {
+            $geocodingName = $app['conf']->get(['geocoding-providers', 0, 'name']);
+            $app['conf']->remove(['geocoding-providers', 0, 'name']);
+            $app['conf']->set(['geocoding-providers', 0, 'map-provider'], $geocodingName);
+        }
+
+        //  video-editor section change, replace 'vttFieldName' to 'ChapterVttFieldName'
+        if ($app['conf']->has(['video-editor', 'vttFieldName'])) {
+            $chapterVttFieldName = $app['conf']->get(['video-editor', 'vttFieldName']);
+            $app['conf']->remove(['video-editor', 'vttFieldName']);
+            $app['conf']->set(['video-editor', 'ChapterVttFieldName'], $chapterVttFieldName);
+        }
+
+        // remove registry classic section if exist
+        if ($app['conf']->has(['registry', 'classic'])) {
+            $app['conf']->remove(['registry', 'classic']);
+        }
+
+        // remove bridge section if exist
+        if ($app['conf']->has(['main', 'bridge'])) {
+            $app['conf']->remove(['main', 'bridge']);
+        }
+
+        //  insert RGPD bloc if not exist
+        if (!$app['conf']->has(['user_account', 'deleting_policies', 'email_confirmation'])) {
+            $app['conf']->set(['user_account', 'deleting_policies', 'email_confirmation'], true);
+        }
+
+        return true;
+    }
+}
diff --git a/lib/conf.d/configuration.yml b/lib/conf.d/configuration.yml
index 0e13eba50c..de1eab7f0a 100644
--- a/lib/conf.d/configuration.yml
+++ b/lib/conf.d/configuration.yml
@@ -94,6 +94,7 @@ main:
         download: null
         lazaret: null
         caption: null
+        tmp_files: null
 
 trusted-proxies: []
 debugger:
@@ -241,7 +242,7 @@ embed_bundle:
 geocoding-providers:
     -
         map-provider: 'mapboxWebGL'
-        enabled: true
+        enabled: false
         public-key: ''
         map-layers:
             -
@@ -284,7 +285,7 @@ geocoding-providers:
         provincefields: Province
         countryfields: 'Country, Pays'
 video-editor:
-    vttFieldName: VideoTextTrackChapters
+    ChapterVttFieldName: VideoTextTrackChapters
     seekBackwardStep: 500 # in ms
     seekForwardStep: 500  # in ms
     playbackRates: