Merge "optional flag to enable tracker debugging"