Pass client to parent constructor
Merge branch 'cookie' into development