diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de8bbecc6c..269d4330ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -440,7 +440,7 @@ API:main:machines: *api_test_template
 API:main:networks: *api_test_template
 API:main:schedules: *api_test_template
 API:main:scripts: *api_test_template
-API:main:rbac: *api_test_template
+API:main:teams: *api_test_template
 API:main:ip_whitelisting: *api_test_template
 API:main:volumes: *api_test_template
 
@@ -469,7 +469,7 @@ UI:keys: *ui_test_template
 UI:scripts: *ui_test_template
 UI:images-networks: *ui_test_template
 UI:user-actions: *ui_test_template
-UI:rbac-teams: *ui_test_template
+UI:teams: *ui_test_template
 UI:zones: *ui_test_template
 UI:rules-1/2: *ui_test_template
 UI:rules-2/2: *ui_test_template
@@ -493,10 +493,10 @@ UI:ip-whitelisting:
   only:
     - staging
 
-.UI:rbac-rules-1/4: *ui_test_template
-.UI:rbac-rules-2/4: *ui_test_template
-.UI:rbac-rules-3/4: *ui_test_template
-.UI:rbac-rules-4/4: *ui_test_template
+.UI:rbac-1/4: *ui_test_template
+.UI:rbac-2/4: *ui_test_template
+.UI:rbac-3/4: *ui_test_template
+.UI:rbac-4/4: *ui_test_template
 .UI:orchestration: *ui_test_template
 .UI:insights:
   <<: *ui_test_template
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c9c25cecc7..d3b1594bf2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,18 @@
 # Changelog
 
-## v3.4.0 (unreleased)
+## v4.0.0 (unreleased)
+
+This is a major release that brings important performance improvements both in the backend as well as in the frontend. It also introduces usability improvements when filtering lists, when adding "other server" clouds and when selecting tags, keys & networks.
 
 * Feature: Automatic backup & restore scripts for mongo & influx
 * Feature: Pre and post action hooks
+* Feature: Widget to select existing tags
+* Feature: Configurable filters in every list
+* Feature: Searchable selection widgets for keys & networks
+* Feature: Collapsible sections in monitoring dashboards
+* Change: Improve interaction when adding "Other Server" Clouds
+* Change: Upgrade backend code to Python 3.7
+* Change: Upgrade frontend code to Polymer 2.x and Web Components v1
 
 ## v3.3.1 (6 November 2018)
 
diff --git a/api b/api
index 5cfc7bd2ef..c2b87ff204 160000
--- a/api
+++ b/api
@@ -1 +1 @@
-Subproject commit 5cfc7bd2ef59d1caf2193762a71a345b5251ddc0
+Subproject commit c2b87ff204a31b9a95f0b275c1ab2a4d8892c838
diff --git a/chart/mist/values.yaml b/chart/mist/values.yaml
index c736764789..407365614e 100644
--- a/chart/mist/values.yaml
+++ b/chart/mist/values.yaml
@@ -236,13 +236,13 @@ deployment:
         enabled: true
         minReplicas: 1
         maxReplicas: 20
-        targetCPUUtilizationPercentage: 80
+        targetCPUUtilizationPercentage: 85
         # targetMemoryUtilizationPercentage: 80
       gracePeriod: 3600
       resources:
         requests:
-          memory: 1000Mi
-          cpu: 600m
+          memory: 800Mi
+          cpu: 300m
         limits:
           memory: 1200Mi
           cpu: 2000m
@@ -262,7 +262,7 @@ deployment:
       resources:
         requests:
           memory: 150Mi
-          cpu: 200m
+          cpu: 100m
         limits:
           memory: 250Mi
           cpu: 1000m
@@ -461,7 +461,7 @@ deployment:
       resources:
         requests:
           memory: 500Mi
-          cpu: 1000m
+          cpu: 800m
         limits:
           memory: 700Mi
           cpu: 2000m
@@ -500,7 +500,7 @@ deployment:
       resources:
         requests:
           memory: 250Mi
-          cpu: 500m
+          cpu: 400m
         limits:
           memory: 500Mi
           cpu: 1000m
@@ -537,7 +537,7 @@ deployment:
     resources:
       requests:
         memory: 800Mi
-        cpu: 600m
+        cpu: 400m
       limits:
         memory: 1000Mi
         cpu: 2000m
diff --git a/tests b/tests
index 0d6d014038..94fc3e6934 160000
--- a/tests
+++ b/tests
@@ -1 +1 @@
-Subproject commit 0d6d014038200d4dd036d45c77ba9ba47c333b96
+Subproject commit 94fc3e69347d680df4fdd427a026b83d15773c0f
diff --git a/ui b/ui
index 6e92c01a81..30a1b21398 160000
--- a/ui
+++ b/ui
@@ -1 +1 @@
-Subproject commit 6e92c01a812bcfe85994b592266907e8edf0911c
+Subproject commit 30a1b213987402a23ca853f2ebe2bec94632f370