Fixed dependencies on highest SDK version.
Merge branch 'develop'