Too many unnecessary peekRestClient() calls.
Merge pull request #529 from bhariharan/unstable

Too many unnecessary peekRestClient() calls.
Merge branch 'unstable' into unstable23
Merge pull request #530 from bhariharan/unstable23

Merge branch 'unstable' into unstable23