Dev

assigned to @mweise

added 5 commits

• 8afed402...dd00e9f3 - 2 commits from branch master
• 196c1545 - Merge branch 'master' into dev
• ad0b0ca8 - Re-added .env
• f50b5ca9 - Updated stuff

Compare with previous version

enabled an automatic merge when the pipeline for f50b5ca9 succeeds

mentioned in commit 9a198d40

merged