test a966995e-cc4a-4ff8-b8cf-986dbc702c23 (rebased onto develop)



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

----

This is a call to sandbox.open_pr