update configuration
Merge branch 'tmp'

* tmp:
  update configuration
update configuration