Merge branch 'hx/lookup-commit-in-graph-fix' into maint