test d5c1c995-2112-4ba1-905a-21949d178e7e (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr