Bugfix stakeholder review
Merge branch 'hotfix/v0.79'