Merge branch 'hotfix/v0.78'
Bugfix stakeholder review
Merge branch 'hotfix/v0.79' into develop