[TIMOB-18097]: Fix CLI crashes
[TIMOB-18097]: Fix typo
[TIMOB-18097]:  Code clean up
Merge pull request #6413 from hieupham007/timob-18097

[TIMOB-18097]: Fix CLI crashes