[DF-1572] and [DF-1781] fixed.