[DF-4498] - changes found while testing with client.