test 3fe4d62a-5896-4db7-a259-6300f71c1460 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr