[DF-5024] Review fixes and fixed receiving unwanted data.