test 46a104cd-934d-482f-8b10-afa3b7497eb9 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr