ospath class->func
Merge branch 'ospath_edit' into develop