Merge branch 'master' into 'Develop-multiwell-analysis'

# Conflicts:
#   .gitlab-ci.yml
#   .vscode/settings.json
1 job for Develop-multiwell-analysis in 1 minute and 52 seconds (queued for 17 seconds)