[DF-2031] - Fix by comments