Merge branch 'fixOrphanedEdges'