test eb7723d8-c128-4fbc-874c-e27ee448efc6 (rebased onto develop)



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

----

This is a call to sandbox.open_pr