test 35eb792e-0001-4313-bf0e-d576dd4b9452 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr