Adds IDs to the scan statistics table.
Merge branch '2.1final' into qa