test 9b1ae3cd-1e17-4ee4-8679-1684cf37c0a6 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr