Original MR (!38506 (closed)) got a bit outdated and messy. This one should inlcude changes made there, as well as some of Tim's changes in the corresponding MR !37279 (closed).
Includes MR !40050 (merged) which I made separately because it was a big-ish change to a widely used component.
Doesn't work yet - WIP. Also some things are commented now but will be removed fully