Some deprecation warnings has been deleted
Merge branch 'develop'