DEV-53527 - Fix and Extend Tracking for Tablomat