test d20784ab-8028-492b-a872-e013332a93cf (rebased onto develop)



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

----

This is a call to SandboxTest.open_pr