Merge "Set tracking state properly" into main