[DF-4223] Fix by review comments