test a794a016-13b5-4292-8700-5cb55d2d30aa (rebased onto develop)



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

----

This is a call to sandbox.open_pr