Merge config resolved
Merge branch 'develop'

* develop:
  Merge config resolved