test 4c5726fb-6c47-4b97-95b2-47838e4cff46 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr