21147 Add mattcen's/jeremyc's EOL patch to CLI.
21147 Add mattcen's/jeremyc's EOL patch to CLI.

alexlance/alloc,cyberitsolutions/alloc,alexlance/alloc,alexlance/alloc,alexlance/alloc,cyberitsolutions/alloc,alexlance/alloc,cyberitsolutions/alloc,cyberitsolutions/alloc,cyberitsolutions/alloc