[DF-2880] - changes according to Alexey's request.