main
Improve compatibility with special default values in JS configs (#19348)
Make upgrade tooling more stable (#19846)