test 94cd3800-8b47-4828-ba85-11c73cbe11ae (rebased onto develop)



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

----

This is a call to sandbox.open_pr