Refactor: no need for _edges_annotated.
Merge remote-tracking branch 'origin/master'