test 588e9dca-91ca-4d65-b715-05803765189e (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr