[DF-2031] - Fix by comments DAVAF-2123#CFR-288180