test e6aec644-a4cc-4727-8082-a515611d3252 (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr