am af3cd21b: Merge "New command line tool: "settings"" into jb-mr1-dev

* commit 'af3cd21b08dd22d6ffd747c6314fd49fed3170a0':
  New command line tool: "settings"