Merge branch 'master' into 'feature/add_deadpixelcorrection'

# Conflicts:
#   enpt/execution/controller.py
#   enpt/model/images.py
#   requirements.txt
#   setup.py
#   tests/gitlab_CI_docker/context/environment_enpt.yml
4 jobs for feature/add_deadpixelcorrection in 16 minutes and 50 seconds (queued for 1 minute and 8 seconds)