test d6295405-144f-44f5-84b4-a201a1804367 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr