test cb67698f-9f34-40ab-93dd-8879c30188b5 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr