Change Details

There's a small unit test here, but mostly this has been Tested in combination with the following diffs

There's a small unit test here, but mostly this has been tested in combination with the following diffs

There's a small unit test here, but mostly this has been Ttested in combination with the following diffs