[DF-3178] Fixed issues after review 2