test 320915a9-1176-4fc1-bddb-fd459ec44277 (rebased onto develop)



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

----

This is a call to sandbox.open_pr