[DF-4927] Fix by review comments