Depends on D83691
Taking over this patch, as Daniel is no longer involved.
Rebase
WDYT @Bigcheese?
This LGTM.