Merge branch 'edge' into extruderfix