test 96a69ce9-b351-435d-ac69-5bd1b623df7e (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr