test 2ad54bee-217d-4d71-9db9-2409fd57e4bb (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr