Merge branch '2.x' into main

.github/workflows/continuous-integration.yml

@@ -32,7 +32,7 @@ jobs:
         uses: "actions/checkout@v2"
 
       - name: Run CouchDB
-        timeout-minutes: 1
+        timeout-minutes: 3
         continue-on-error: true
         uses: "cobot/couchdb-action@master"
         with:
@@ -114,7 +114,7 @@ jobs:
           sudo sysctl -w vm.max_map_count=262144
 
       - name: Run Elasticsearch
-        timeout-minutes: 1
+        timeout-minutes: 3
         uses: elastic/elastic-github-actions/elasticsearch@master
         with:
           stack-version: "${{ matrix.es-version }}"