Merge branch 'hn/log-graph-color-octopus' into maint