Merge branch 'develop'

* develop:
  Merge config resolved
Merge branch 'master' into develop

* master: