ADEN-1274 Re-split tracker and tracker.stub