test be78eacb-7502-4e15-9a67-c7374cd91128 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr