Merge change 26220 into eclair

* changes:
  Reimplement the settings to use async callbacks