test dad6868d-4f3c-47da-b6e3-340c7611e0d0 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr