[#8375] tracker fixes
6 files changed