Merge "Fixes in RestClient"