Merge branch 'dev' into condition_inferers

Author: FinnBehrendt

.github/workflows/conda.yml

@@ -21,6 +21,7 @@ jobs:
         os: [ubuntu-latest]
         python-version: ["3.9", "3.10"]
     runs-on: ${{ matrix.os }}
+    timeout-minutes: 46 # equal to max + 3*std over the last 600 successful runs
     env:
       QUICKTEST: True
     steps: