Merge "Adding SupportedModesVote" into main