test 18ced347-dd47-44dd-a118-a18519e8ad48 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr