Merge "Make sure user tracking stops" into main