test 2b74959e-28ee-4bac-ba41-49a23e390e92 (rebased onto develop)



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

----

This is a call to sandbox.open_pr