Merge branch 'master' into develop
remove obsolete code
Merge branch 'develop'