Merge pull request #176 from throwaway96/cli-tools-v3-20240307

Merge pull request #176 from throwaway96/cli-tools-v3-20240307 #310