test ec815232-9ef3-4a3c-97ec-e222034918f5 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr