ENG-4713: Address review comments from Izzy in ClientInterface.