Merge "Add GTE compatibility logic for NoVote" into main