Hotfix/error messages

assigned to @mweise

added 3 commits

• 008bdf52...c6b50a7b - 2 commits from branch dev
• ece94b1a - Merge branch 'dev' into hotfix/error-messages

Compare with previous version

enabled an automatic merge when the pipeline for ece94b1a succeeds

mentioned in commit 5d1662ac

merged