Fixes #23383 (closed)
Note to all: feel free to push to this branch, and merge from v4-dev, but please do not rebase until we are ready to merge to v4-dev.
TODO:
-
Make sure tests are green -
Check for properties order -
Tighten rules -
Make sure Hound works