Use utils.inherit in client
Tiny fix
Merge branch 'inherit'