Merge branch 'hotfix/post-release-8-fixes'
Lengthened by state graph to avoid squished-up labels
Merge branch 'hotfix/state-chart' into develop