Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31' * commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31': Reimplement the settings to use async callbacks
Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31' * commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31': Reimplement the settings to use async callbacks