Merge pull request #756 from fabro-sh/refactor/graph-reference-kind