[OTR-5933] Updated Client