test 1046b2a5-4e08-4a63-a535-d2f31c84184d (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr