(cherry picked from commit ac543173)
As result this was sending wrong data type during or at the end of the scan.