fix interfaces
Merge branch 'develop'