[client][managed][offline] merge pull request #338 and add unit tests
[client][managed][offline] update comments for alpha5