Fix some duplicates and synchronize with 21.3
Fix tracking sequence for FTK as suggested by Jiri in ATR-19760, tagging @sutt and @zgrout .
Closes ATR-19760