main
✅ ♻️ Merge test helpers files (#35985)
Lint remaining static enums in src (#36821)
Validator rollup 20210819 (#35748)