Merge branch 'jk/mark-edges-uninteresting'