Work in progress - check in.
[OTR-5933] Updated Client