test a039b156-719d-4178-81ec-0cb84f82e73a (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr