Merge "cmd_fuzzer: Bug Fix" into main