test e334fda1-7569-4b7d-8ec1-4530b0f6095b (rebased onto develop)



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

----

This is a call to sandbox.open_pr