This will make a following diff a little easier.
Depends on D13913
Flow. Also tested in combination with the rest of the stack
Rebase