[DF-3978] fixed issues after merge