test 856de3cf-1cb7-46bb-ab24-3498866d040e (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr