Merge branch 'no-edges2'