Merge "New Feature Request: CLI for SO"