Finish InspectorView

Finish InspectorView
Merge branch 'zz_local'
Merge

Merge