Fix for non streaming clients#967

dussab merged 3 commits intomainstacklok/codegate:mainfrom

fix-for-non-streaming-clientsstacklok/codegate:fix-for-non-streaming-clientsCopy head branch name to clipboard