Merge "Fix BatchScan request coalesing" into klp-dev