Merge branch 'np/log-graph-octopus-fix'