test bc5c89d4-f8bf-499b-9d89-d44805485f3b (rebased onto develop)



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

----

This is a call to sandbox.open_pr