test 90f0deb1-f032-4623-91d7-f51985e9ad17 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr