Completion routine added for Client streaming
Merge remote-tracking branch 'origin/Client' into UI