test 80466535-b80b-4d0d-811d-967be1577b44 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr