test db5a9321-f832-4c7f-a3a1-575167943fcd (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr