[DF-2214] Fix by review comments