Merge pull request #6424 from etracer65/cli_use_memcmp