[DF-1106] - additional changes requested by Alexey.