test 740ddc47-553d-4270-ba90-9af2e81e1f53 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr