Implement client side context

Merged Theodore Chang requested to merge 806-entry-reference into v1.1.0

Merge request reports