REFS #790 - Fixed issue
REFS #790 - Added tests
Merge pull request #794 from n1k0/feat-clientutils-injection

Feat clientutils injection