test 6475b983-b682-42b8-8fdb-a05df3e04ade (rebased onto develop)



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

----

This is a call to sandbox.open_pr