[DF-2395] Changes for defect.