Merge "Extend remote client to allow for better debugging"