Fix configuration
Merge branch 'develop' into 2.0

* develop:
  Fix configuration