Implemented relevant changes to allow combined tracking to be functional again (we...