[DF-4236] - another Code Review changes.