test f4888ea6-b583-4867-87dc-1c59c0c06a92 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr