Move diff. Plan to use these types across different files
Depends on D11775
flow
rebase before landing