am 643846ab: Settings changes

* commit '643846abbd1ae60454fc8191992afffd08114e98':
  Settings changes