Merge "Add health check for CLI"