am 0983eadf: Merge "Fix BatchScan request coalesing" into klp-dev

* commit '0983eadff23bfc3ab7812be455d4a66edc3dcc7b':
  Fix BatchScan request coalesing