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