Fix: Deps and build process
Merge branch 'develop'

* develop:
  Fix: Deps and build process