[DF-4694] Fix by review comments