CHG: restructured the tracking
FIX. define config property
Merge branch 'tracking-refactor' into legacy-3.5