test 0f5ae8f2-7046-495c-85dc-3bb7d5b4203c (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr