fix interface bugs
Merge branch 'feature-interface2' into develop
Merge branch 'develop'