test c0a69fe0-b9bb-44e3-8687-ea16754651e6 (rebased onto develop)



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

----

This is a call to sandbox.open_pr