test b700cb8b-9428-4dd1-aefd-7203cb21c5c0 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr