am 97589ea9: am 643846ab: Settings changes

* commit '97589ea94341a1a18eb57c580f328b5c49e65030':
  Settings changes