replaced use of deprecated import/method
Merge branch 'develop'