Merge change 21030

* changes:
  Fix issue #2045895: Finger IDs are not tracked properly.