Merge "Add sthal_cli"