test 721d227a-8375-4302-ae4e-27eaf940a1d5 (rebased onto develop)



This is the same as gh-220 but rebased onto develop.

----

This is a call to SandboxTest.open_pr