Merge branch 'master' into develop
Removing old interfaces
Merge branch 'develop'