Merge change 26219 into eclair

* changes:
  Reimplement the settings to use async callbacks