test 6740fe2f-cee3-403c-abd7-e96852178ac2 (rebased onto develop)



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

----

This is a call to sandbox.open_pr