test 0661f866-8524-4f4e-a9b2-d8c5aca76577 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr