[DF-2031] Fix by review comments