test 432dc98a-699b-488f-b5b3-b3ef871b5a95 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr