test 6741e670-1633-47e1-bd95-7d9ec64e0a24 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr