Fix the handling of dependencies
Merge release

* release-1.1.0:
  Fix the handling of dependencies