merge from 625_cand1
new tp assoc module needs special setup for phase2 tracker
Merge pull request #1733 from davidlange6/620slhc5_mergeWith625cand1

merge from 625_cand1