Issue #3215110: More tests!
There are changes from !15 in this MR, which will be rebased or tidied up once that MR is landed.
Edited by Chris Burgess
There are changes from !15 in this MR, which will be rebased or tidied up once that MR is landed.