This is the last version not depending on tracker3, tracker3 will follow after the quarterly is branched