[DF-772] fixed sub-task - [DF-1770].