[DF-4337] Fix by review comments