main
Make upgrade tooling more stable (#19846)
Bump dependencies (#20381)
try converting variants with arbitrary values to builtin variants