Fixed wrong generated libs.
Merge branch 'develop'