Merge branch 'bl/edgeloop'