These are present in another MR, but for now include them here
and then rebase.