Merge "Use an enum instead of a pair for vis changes" into main