test 68cb6573-428c-488e-be40-0ec688d04392 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr