test beef2689-8833-483b-bb0d-17f0161e313d (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr