Issue #8204 by tuj: Added further code for client