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