Fix Material target
Fix warnings
Merge from master
Merge branch 'master' into hilight_constraints
Add support for main axes, root point and external edges.