Merge pull request #529 from bhariharan/unstable

Too many unnecessary peekRestClient() calls.
Latest shared