Merge "Fix settings shell command"